Merge branch 'develop'
Prepare 0.3.1 release
Merge branch 'master' into develop