Merge pull request #6 from roghu/develop

Version 0.6