Feature/fixdesign#91

#91