Merge pull request #441 from katzj/localhost-sql