Context fixes

Fixed poor spelling and context issues.
Merge pull request #468 from bitigchi/patch-4

Context fixes