Merge branch 'master' of github.com:batekman/scripts
some changes