context defaults
Merge pull request #676 from Tendrid/develop

context defaults