Nearly finish with no timeout yet and haven't test
Merge branch 'master' of https://github.com/Fuoon/Project3