New design implementation
Merge pull request #80 from rbrs/master

New design implementation