Fixes #5
Merge pull request #6 from vimishor/dev

Fixes #5