Merge pull request #2 from comzeradd/master

Fixtures
Merge pull request #3 from comzeradd/master

Design fixes