Zver edit
task#191
Merge branch 'dev'
do
zvers changes
Merge branch 'dev'
master