Design update.
Merge pull request #3 from cmarius02/master

Design update.