SQL Verification Improvements
Merge upstream
Merge pull request #9 from jmcs/master

SQL validation improvements