Add missing properties to context. See #74.
Merge pull request #80 from acka47/adjust-context

Add missing properties to context.