refactor and add functions of parse keyword from our dict
Merge remote-tracking branch 'origin/master'