Merge pull request #5 from michielvoo/master

Fix issue #2, issue #3 and issue #4.

Thanks very much for your contribution!

Author: maxhauser