fix issue 28 and 30
fix issue 28 and 30
Merge pull request #32 from Daytron/hotfix/issue-28-and-30

Hotfix/issue 28 and 30