Improve design
Merge pull request #2 from mvleming/design

Improve design