added timeouts
Merge branch 'master' of https://github.com/Iteam1337/Wejay