design improvement
Merge pull request #1 from ericallard0/master

design improvement