context vs context.impl wtf #12
Merge branch 'master' into gh-pages