design
Merge pull request #36 from Thibou/design-improvement

design