context not ready? #12
Merge branch 'master' into gh-pages