Merge pull request #2 from Asanvery/master

0.3.0
Merge pull request #3 from Asanvery/dev

Merge pull request #2 from Asanvery/master