sync with Context as of 2013-09-03
Merge pull request #17 from phi-gamma/master

sync with Context as of 2013-09-03