Merge branch 'release/0.3.1' into develop

* release/0.3.1:
  update version
fix errors
update version
Merge branch 'release/0.3.2'

* release/0.3.2:
  update version
  fix errors