Added timeout controll, better error handling
Merge branch 'master' of https://github.com/gradesystem/grade-console.git
Fixed search