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

update