handle timeout
Merge branch 'master' of https://github.com/pubfox/webservices