Merge pull request #1 from zhonglinyuan/master

Need max's updates
changed index file
Merge pull request #2 from GitNooby/master

test merge 2