bump version to 0.3.0
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'develop'