Fixed issue 93
Fixed issue 84
Merge pull request #94 from diatmpravin/issue_93

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

Fixed issue 84