Fix context to be extended
Merge pull request #31 from segmentio/fix/context

Fix context to be extended