Merge branch 'hotfix/0.1.2'
Merge branch 'release/0.2.0'
Fixing small file name issue
Merge branch 'hotfix/0.2.1' into develop