Work in progress
Merge branch 'master' of git://github.com/tjflaagan/Tools