Merge pull request #56 from stecd/design

Design
Merge pull request #57 from stecd/master

Merge pull request #56 from stecd/design