WIP 0.3.2
Merge branch 'master' into testing