Fixes some (not all) issues in #3
Fix
Merge pull request #9 from spolu/fix3

Review: Fixes #3