修正正则，解决注释后一行不被识别问题
Merge branch 'master' into gh-pages