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

Fix issue 26