Merge pull request #1 from fcitx/master

Come From MainLine
Merge branch 'master' of https://github.com/lenky0401/fcitx