Design Changes
Merge pull request #23 from P4V4/master

Design Changes