Merge pull request #52 from missoby/master

design
Update
design