Design Changes
Merge pull request #21 from P4V4/master

Design Changes