Fixes #7
Merge pull request #8 from benastan/bugs/7

Fixes #7