Copying some of Brian Kelly
Merge branch 'master' of github.com:gbataille/MyConfig