Design updates
Merge pull request #52 from davidkaneda/master

Design updates