merge PR #32 and regenerate HTML