Merge branch 'hotfix/0.1.1'
even more gitignore
Merge branch 'hotfix/0.1.2' into develop