Merge pull request #88 from mamarley/psqllimitallfix