Merge pull request #34 from benni0815/master

Fix for issue #31