small formatting changes
remove \n, fix rebuild-logic
Merge branch 'develop' into hotfix/0.1.1
Merge branch 'hotfix/0.1.1'