Merge pull request #122 from mamarley/psqltzfix