diff --git a/format-master.xml b/format-master.xml
index 2875ed1..ef6660d 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -692,7 +692,14 @@
 
 	
 	<!--
-		Sample answers, which may optionally be excluded from the output.
+		Sample answers, which may optionally be excluded from the
+		output. This can be done globally for all answers by setting the
+		style sheet parameter $showanswers to "no", or it can be done
+		locally on a question-by-question basis by setting the @hide
+		attribute of the element to "yes".
+		
+		@hide: If "yes", don't include this answer in the output stream.
+		The default is to include the answer.
 	-->
 	<template name="answer" match="answer">
 		<latex>
@@ -715,6 +722,11 @@
 			</xsl:if>
 		</html>
 	</template>
+	
+	<!--
+		Match hidden answers and do nothing.
+	-->
+	<template name="hidden-answer" match="answer[@hide='yes']"/>
 
 	
 	<!--
@@ -821,17 +833,27 @@
 			<xsl:if test="/document/@standalone = 'yes'"><xsl:apply-templates/></xsl:if>
 		</latex>
 		<html>
-			<xsl:choose>
-				<xsl:when test="/document/@class = 'tutorial'">
-					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
-				</xsl:when>
-				<xsl:when test="/document/@class = 'laboratory'">
-					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
-				</xsl:when>
-				<xsl:otherwise>
-					<H1><xsl:apply-templates/></H1>
-				</xsl:otherwise>
-			</xsl:choose>
+			<H1>
+				<xsl:choose>
+					<xsl:when test="/document/@class = 'tutorial'">
+						<xsl:if test="$showanswers='yes'">Selected Answers for </xsl:if>
+						<xsl:call-template name="PaperCode"/>
+						<xsl:text> Tutorial </xsl:text>
+						<xsl:value-of select="/document/@sequence-number"/>
+						<xsl:text>: </xsl:text>
+						<BR/>
+					</xsl:when>
+					<xsl:when test="/document/@class = 'laboratory'">
+						<xsl:if test="$showanswers='yes'">Selected Answers for </xsl:if>
+						<xsl:call-template name="PaperCode"/>
+						<xsl:text> Lab </xsl:text>
+						<xsl:value-of select="/document/@sequence-number"/>
+						<xsl:text>: </xsl:text>
+						<BR/>
+					</xsl:when>
+				</xsl:choose>
+				<xsl:apply-templates/>
+			</H1>
 		</html>
 	</template>
 
