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

sync with Context as of 2013-11-03