Merge pull request #5 from roghu/develop

Version 0.4