folio additions
Merge branch 'folio' into Scriptorium