gitignore update
Merge branch 'hotfix/0.2'