Minor stuff
Merge branch 'master' of github.com:jrlanglois/CodeTools