Merge branch 'hotfix-0.1.2'
update to the ignore file
fixed merge conflice