Merge branch 'develop', version 0.8