added timout detection hopefully...
Merge branch 'master' of https://github.com/b0nk/botxxy