Merge pull request #3 from valeravorobjev/dev

Stable version with flat ui