Merge branch 'develop'
backmerging release 0.3.1 into develop