Fixes to last push
Merge branch 'master' of https://github.com/gminaker/databases into gordon