Changes made by Rick Martin and various improvements
Merge branch 'master' of https://github.com/ClarionLive/UltimateSQL