modified 3.2 and 4.3 to be consistent
Merge branch 'master' of https://github.com/shumash/db_project