Minor fixes.
Merge branch 'master' of github.com:Chunbinlin/Context-Sensitive