Merge pull request #6 from roghu/develop

Version 0.6
Merge pull request #7 from roghu/master

Start of Version 0.7dev