added context
Merge pull request #61 from ajstanley/7.x

added context