Merge pull request #2 from mrtoothbrush/development

Development
Merge branch 'development'. Version 0.8.9. Sprint 4
Remove sontgen dir