commit2
Merge pull request #1 from zuoheng/master

fixted1
fixed2