#292 enhance design

#292 solved.