Fixed issue 63
Merge pull request #80 from diatmpravin/issue_63

Fixed issue 63