Fix the keywords problem.
Merge pull request #236 in YIN/basic from bugfix/YCB-101-a to develop

# By haoxiangchen
# Via haoxiangchen
* commit 'b9c22ae9ee7ae524d1f4574394793e1fe0ee715f':
  Fix the keywords problem.