design review
Merge pull request #1 from mlarcher/develop

design review