design improvements
Merge pull request #3 from agessler/design

design improvements