Redesigned
Fix
Merge pull request #3 from oranzhang/master

fix