Merge branch 'release/0.3.10' into develop
fix bug
bump version
Merge branch 'release/0.3.11'