art design
Merge branch 'master' into design
fix yuriy mistakes
Merge branch 'design'