fixing timeout issues
Merge branch 'master' of https://github.com/ProtoTest/Grolem