New Design issue #11 closed
Merge branch 'new-design'