new design v6
Merge pull request #379 from maxbugaenko/master

new design v6