Merge pull request #6 from iToto/develop

New Design
Merge branch 'develop'