Cfp/design

fix #102