issue #787, #776
Merge branch 'merge-gui-master' of https://github.com/imeji-community/imeji into merge-gui-master