Fix issue 20
Merge pull request #41 from Daytron/hotfix/issue-20

Fix issue 20