Merge pull request #28 from nkashyap/dev

v0.2.3
Merge pull request #33 from nkashyap/dev

Minor fixs