new design
Merge pull request #1 from lenarox/master

master