Fixes
Merge branch 'gh-pages' of github.com:gpmd/colophon into gh-pages