Merge branch 'new_design' into develop

this closes #73

BUmped version 2.1.0