Fixes #3
Merge pull request #7 from fardog/master

Fixes #3