Merge pull request #103 from mamarley/psqlrefactor2