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

sync