fix defaults in context
Merge pull request #675 from Tendrid/develop

fix defaults in context