Merge branch 'develop'
Prepare 0.3.0 release
Merge branch 'master' into develop
Remove comment out of some specs