Fixes #326, #331 and corrects markup issues with pull-request #390.