Fix #35
Merge pull request #42 from eustasy/master

Fix #35