Merge pull request #3 from roghu/develop

Version 0.2
Merge pull request #4 from roghu/master

Version 0.2