Add timeout to server check
Merge pull request #21 from zifnab06/upstream

Add timeout to server check