fixes #3 and fixes #4
Merge pull request #5 from Tieske/master

fixes #3 and fixes #4