fixed timeout
Merge commit '5731d17'
Merge branch 'master' of https://github.com/kjian279/RISC