Leroy Submit 1128
Merge pull request #27 from Leroy1245/WhereAnalysis

Leroy Submit 1128
Merge pull request #13 from HuiLi/master

合并更新