New design
Merge pull request #24 from DeKoyre/feature

New design