Issue 63 fixed
Merge pull request #64 from marcwittke/master

Fix for Issue 63