Merge branch 'develop'
backmerged release 0.4.0 into develop