Fix #141
Merge pull request #142 from TheUnknownOne/design

Fix #141