first edit by bin
Merge pull request #1 from xbzhao/master

first edit by bin