Update .gitignore
Update re #5
Merge branch 'master' into #5