Results 11 comments of yehuohan

@phaazon I have updated the commit and rebased on the lastest commit. And this PR is ready for review now.