Context changes for 2.7
Merge pull request #10 from lsuits/27_readiness

Context changes for 2.7