Change variable handling
Merge branch 'master' of github.com:georgeyord/scripts