Fix for issue #35
Merge pull request #36 from mhwombat/master

Fix for issue #35