more design updates
Merge pull request #84 from IsUncommon/master

more design updates