Minor
Merge branch 'Thomas'
Merge branch 'master' of https://github.com/gminaker/databases