Fix probably a bad merge.. This should be the connection object
Merged pull request #335