Fix for issue #4
Merge pull request #5 from saikos/master

Fix for issue #4