Added timeout to DB
Merge pull request #87 from bstascavage/master

Added timeout to DB