Merge pull request #110 from brettwooldridge/Bug#65

Hand written SQL-parser, based off of former regexes.