More proper SQL
Merge branch 'master' of https://github.com/mmeyer2k/core.git