Merge pull request #4 from liangrockman2/master

Merge Test 7
none
Merge pull request #5 from guantaozhou/master

 8 - 9 night
Merge pull request #7 from liangrockman/master

Merge guantao's code