Merge branch 'dev'
.gitignore updated
Updated the fetcher
Merge branch 'master' into dev