Commit #17.1

- Modified database-connection