Changed DB to Postgres
Merge branch 'iss1'