Fixed issue #39
Merge pull request #44 from funkyboy/master

Fixed issue #39