second commit bolun july 22
Merge pull request #1 from huangbolun/master

second commit bolun july 22