Merge pull request #487 from mayerwin/patch-1