Merge branch 'master' into dev
Fixed #9 and renamed some folders
added more sensible watch
Merge branch 'dev'