#7 rough design
Merge branch 'enhancement7' into 0.1.0-update