Merge pull request #7 from iyudincev/master

fix conflict with Editor Word Completion plugin