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

sync with Context as of 2013-09-21