Merge pull request #49 from missoby/master

design
Merge pull request #50 from missoby/master

design
Merge pull request #51 from missoby/master

design
Update
Update
Update
Update
design