Fix issue 44
Merge pull request #45 from Daytron/hotfix/issue-26-and-33

Fix issue 44