Merge branch 'hotfix/qwerty'
#fix 5
Merge branch 'hotfix/fix_#5' into develop