Redesigned
Merge pull request #2 from oranzhang/master

Redesigned