yina first 20140903
Merge pull request #1 from lgzhang/yina

yina first 20140903
Merge pull request #2 from lgzhang/master

fix merge