Merge pull request #1 from roghu/develop

Version 0.1
Merge pull request #2 from roghu/master

Merge pull request #1 from roghu/develop