fix bugs in safeContextKeyword
Merge pull request #57 from doochik/safeContextKeyword-fixes

fix bugs in safeContextKeyword