Fixed issue 84
Merge pull request #95 from diatmpravin/issue_84

Fixed issue 84