sync with Context as of 2013-11-04
Merge pull request #22 from phi-gamma/master

sync with Context as of 2013-11-04