Merge pull request #58 from missoby/master

design
design