Merge branch 'release/0.6.0'
Merge branch 'release/0.6.4'
fix typo in README
Merge branch 'master' into develop