Improves Timeout handling
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/flhook/abstract_connection.rb