Timeout working
Merge branch 'master' of https://github.com/asterixom/JOCChat.git