Merge pull request #14 from praccu/master

Updating
Merge pull request #29 from kostya-viktorov/master

Different Layouts