Merge branch 'hotfix/0.1'
gitignore update
Merge branch 'hotfix/0.2' into develop