fixed completion when keyword contains '
Merge remote-tracking branch 'origin/master'