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