Merge pull request #10 from CiderMan/master

Fix for issue 9