Fixes an issue reported by marcus via mail
Closes #13 (closed)
This will create a new commit in order to revert the existing changes.
