Fixes #9
Merge pull request #10 from evangalen/0.2

Fixes #9