#4. Chenge Architecture.
Merge pull request #78 from yuri-vashchenko/AMaznyak

 #4. Chenge Architecture.