Design improvements
Merge pull request #150 from cmfcmf/design

Design improvements