fix #4
Merge branch 'hotfix/qwerty'