Merge pull request #1 from sqlboy/master

merge sqlboy:master to gregcotten:master