Fix design +remade. #22

Merged
asmeron merged 2 commits from :master into master 5 months ago