Fix issue #20
Merge pull request #21 from eko/hotfix

Fix issue #20