Merge branch 'master' of github.com:schemacs/h2g2