Added timer to detect connection failure
Merge branch 'master' into refactor
Comments. Comments everywhere.