Fixed #596
Merge branch 'master' of https://github.com/vitmalina/w2ui