Fixes Issue #4
Merge pull request #6 from algermissen/master

Fixes Issue #4