Merge pull request #5 from Aaron-zheng/master

update whole project design
New
Merge pull request #12 from FrankPrince/master

New