fixed bug with endless go routines
Cleaned up how timeouts were detected, still not amazing
Merge pull request #16 from freelancer/master

Fix for bug that can cause leaked goroutines