Fix issue #44
Merge pull request #45 from shadowglen/master

Fix issue #44