Merge pull request from miteshashar/dev Added psycopg2 and solved a small bug