Merge pull request #609 from dzcode-io/switch-to-postgres

Merge pull request #609 from dzcode-io/switch-to-postgres #568