Merge branch 'release/release_0.2.1'
Code fix
Merge branch 'hotfix/github_readme_fix' into develop