Update .gitignore
Add annotation
Merge branch 'dev'