Fix issue #793
Merge pull request #36 from otland/master

Fix issue #793