Merge branch 'hotfix/1.0.4'
Using PostgresSQL
Updating version number
Merge branch 'hotfix/1.0.5' into develop