bug fixed
Merge branch 'yifei' of https://github.com/yutongp/RaiseMeUp into ypei