Merge pull request #637 from Tenkiv/master

Fixes #636