diff --git a/format-master.xml b/format-master.xml
index 0948659..69038f9 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -461,7 +461,7 @@
 				<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
 				<xsl:apply-templates select="*[not(self::caption)]"/>
 				<xsl:if test="count(caption) != 0">
-					<br/>
+					<BR/>
 					<xsl:apply-templates select="caption"/>
 				</xsl:if>
 			</DIV>
@@ -471,7 +471,36 @@
 	<template name="caption" match="caption">
 		<latex><xsl:apply-templates/></latex>
 		<html>
-			<P><STRONG>Figure <xsl:number count="figure" level="multiple" format="1"/>. </STRONG><xsl:apply-templates/></P>
+			<STRONG>Figure <xsl:number count="figure" level="multiple" format="1"/>. </STRONG><xsl:apply-templates/>
+		</html>
+	</template>
+	
+	
+	<!-- Images. -->
+	<template match="image[not(@print-version)]">
+		<latex>
+			\includegraphics[width=<xsl:value-of select="width"/>\textwidth]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$latex-image-format"/>}
+		</latex>
+		<html>
+			<IMG BORDER="1">
+				<xsl:attribute name="SRC">images/<xsl:value-of select="basename"/>.png</xsl:attribute>
+				<xsl:attribute name="ALT"><xsl:apply-templates select="description"/></xsl:attribute>
+			</IMG>
+		</html>
+	</template>
+
+	<template match="image[@print-version = 'yes']">
+		<latex>
+			\includegraphics[width=<xsl:value-of select="width"/>\textwidth]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$latex-image-format"/>}
+		</latex>
+		<html>
+			<A>
+				<xsl:attribute name="HREF">images/<xsl:value-of select="basename"/>-print.png</xsl:attribute>
+				<IMG BORDER="1">
+					<xsl:attribute name="SRC">images/<xsl:value-of select="basename"/>.png</xsl:attribute>
+					<xsl:attribute name="ALT"><xsl:apply-templates select="description"/></xsl:attribute>
+				</IMG>
+			</A>
 		</html>
 	</template>
 
