Merge pull request #2 from danmergens/master

driver connection updates
Merge pull request #3 from danmergens/master

i forgot to commit this too
fixed listeners
Merge remote-tracking branch 'upstream/master'
book em dano