2013 june 26th update
Merge branch 'master' of github.com:enormandeau/Scripts