Merge pull request #3 from Aaron-zheng/master

Aaron version3 to frank
20140526

Main Page
Merge pull request #8 from FrankPrince/master

20140526