Merge branch 'develop'
backmerged release 0.5.1 into develop