Fix issue3
Implement feedback by remcogerlich on pull request.
Merge pull request #4 from lizardsystem/issue3

Fix issue3