resume challenge
Merge pull request #263 from ruijunhuang2010/master

resume challenge