Merge branch 'release-0.3' into develop
clean up
Merge branch 'cleanup' into develop
Merge branch 'develop'