sync with Context from 2013-04-30
Merge pull request #3 from phi-gamma/master

sync with context