Make it easy to setup local files
Merge remote-tracking branch 'origin/master'