Updated to reflect that master script on gist no longer needs editing
Merge branches 'dev' and 'master'