design changes
design change
Merge pull request #1 from alexeygalas/dev

Dev