Merge branch 'master' into dev
Adds .coverage to gitignore
Merge branch 'dev'