Fix issue #758
Merge pull request #23 from otland/master

Fix issue #758