Mergefixsth
gitignore fix
Merge branch 'master' into HEAD