Merge branch 'master' of github.com:onespacemedia/scripts