Adds subheading support on pages
Resolves #20
Resolves #21