Add param to allow for DB selection
Fixing connection with password
Rebase rennekon/master and merge. Closed #32 and #29
update/refactor some code from #32