Merge branch 'develop'
Update 0.3.0 entry
Merge branch 'master' into develop