Merge branch 'hotfix/0.6'
fixed the README.md again
Merge branch 'hotfix/0.7' into develop