Merge pull request #1 from abhinavsingh/develop

v0.3.0
Merge pull request #2 from abhinavsingh/develop

v0.3.1
v0.4.0