Merge pull request #1 from liangrockman/master

Code Update
Merge pull request #2 from liangrockman/master

Merge Test 3
none
Merge pull request #3 from guantaozhou/master

8 - 9 update
Merge pull request #6 from liangrockman/master

Merge guantao's code