Small cleanup
Merge branch 'v1.0' into develop
Merge branch 'develop'