Merge branch 'release/0.3.01' into develop
updated package info
rebuilt
resolved conflict