design
Merge pull request #26 from missoby/master

11/09