Fix issue 34
Merge pull request #42 from diatmpravin/issue_34

Fix issue 34