Port recent changes to forked HTMLReader repository. Work hour: 2.0 hour