Merge branch 'develop'
Merge branch 'develop'
backmerged release 0.3.2 into develop