Merge pull request #37 from nromanen/master

Merge
Security and UI
Merge branch 'yurembo' of https://github.com/nromanen/ch018 into yurembo
Merge pull request #39 from nromanen/yurembo

Yurembo