fixed #33
Fixed #30
Merge pull request #36 from mManishTrivedi/master

Merge Request