Merge pull request #25 from SergeyAbadzhev/Dilya

Dilya
Merge pull request #26 from SergeyAbadzhev/Dilya

Design features
some stuff
some changes
resolved conflicts
Merge pull request #27 from SergeyAbadzhev/NewBranch

some stuff
Merge pull request #29 from SergeyAbadzhev/master

ff