Merge pull request #25 from rlhelinski/sql

Merging SQL branch.