diff --git a/CS2JLibrary/NetFramework/System/DateTime.xml b/CS2JLibrary/NetFramework/System/DateTime.xml
index 25913d8..c8fb44f 100644
--- a/CS2JLibrary/NetFramework/System/DateTime.xml
+++ b/CS2JLibrary/NetFramework/System/DateTime.xml
@@ -260,6 +260,15 @@
       <Get>Calendar.getInstance().getTime()</Get>
       <Set>${this:16}.setNow(${value})</Set>
     </Property>
+    <Property>
+      <Imports>
+        <Import>java.util.Calendar</Import>
+        <Import>java.util.TimeZone</Import>
+      </Imports>
+      <Type>System.DateTime</Type>
+      <Name>UtcNow</Name>
+      <Get>Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTime()</Get>
+    </Property>
     <Property>
       <Imports>
         <Import>java.util.Date</Import>
diff --git a/CS2JLibrary/NetFramework/System/String.xml b/CS2JLibrary/NetFramework/System/String.xml
index fa37904..8988741 100644
--- a/CS2JLibrary/NetFramework/System/String.xml
+++ b/CS2JLibrary/NetFramework/System/String.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -115,6 +115,24 @@
       <Name>EndsWith</Name>
       <Return>System.Boolean</Return>
     </Method>
+    <Method>
+      <Imports>
+        <Import>CS2JNet.System.StringSupport</Import>
+      </Imports>
+      <Java>StringSupport.equals(${arg1}, ${arg2})</Java>
+      <Params>
+        <Param>
+          <Name>arg1</Name>
+          <Type>System.String</Type>
+        </Param>
+        <Param>
+          <Name>arg2</Name>
+          <Type>System.String</Type>
+        </Param>
+      </Params>     
+      <Name>Equals</Name>
+      <Return>System.Boolean</Return>
+    </Method>
     <Method>
       <Imports>
         <Import>CS2JNet.System.StringSupport</Import>
diff --git a/CS2JLibrary/NetFramework/System/Web/HttpException.xml b/CS2JLibrary/NetFramework/System/Web/HttpException.xml
new file mode 100644
index 0000000..13ad760
--- /dev/null
+++ b/CS2JLibrary/NetFramework/System/Web/HttpException.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2007,2008,2009,2010 Rustici Software, LLC
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
+  <Imports>
+    <Import>CS2JNet.System.Web.HttpException</Import>
+  </Imports>
+  <Java>HttpException</Java>
+  <Name>System.Web.HttpException</Name>
+  <Uses />
+  <Inherits>
+    <Type>System.Object</Type>
+  </Inherits>
+  <Methods>
+  </Methods>
+  <Properties>
+    <Property>
+       <Type>System.String</Type>
+       <Name>Message</Name>
+       <Get>${this:16}.getMessage()</Get>
+    </Property>
+  </Properties>
+  <Events />
+  <Indexers />
+  <Constructors />
+  <Fields />
+  <Casts />
+  <UnaryOps />
+  <BinaryOps />
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>kPj7P304u25a8Q4THlxPmOnIaGY=</DigestValue></Reference></SignedInfo><SignatureValue>Rz8lfdu/sjTURDxRTaWtcgqGWcjeeNFLQdllnLnonhyxXe+R3GxCa5JZYqOSvdYlM1Yg0s8VJw6jtKDPx1vS1r6pjgEIcy9ORzV2TUjk0QEHiU0uWyFm1RZhwWii6WdwhE2JB5a8l2wbIROFc37syIxLZghdD8BNupIBWtr7RhU=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/build.properties b/CS2JLibrary/build.properties
old mode 100755
new mode 100644
index a3f0677..a78b57a
--- a/CS2JLibrary/build.properties
+++ b/CS2JLibrary/build.properties
@@ -6,4 +6,4 @@ classes.dir=${build.dir}/classes
 jar.dir=${build.dir}/jar
 zip.dir=${build.dir}/zip
 java.target.vm=1.5
-
+src.zip=${zip.dir}/cs2jlibrary-src.zip
\ No newline at end of file
diff --git a/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailMessage.java b/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailMessage.java
index 3bd7dca..1c1db41 100755
--- a/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailMessage.java
+++ b/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailMessage.java
@@ -15,6 +15,7 @@ public class MailMessage
     private MailAddressCollection _bcc;
     private MailAddressCollection _cc;
     private MailAddressCollection _to;
+    private boolean _html;
     private String _body;
     private InternetAddress _from;
     private String _subject;
@@ -34,6 +35,16 @@ public class MailMessage
         return _to;
     }
 
+    public boolean isHtml() 
+    {
+    	return _html;
+    }
+    
+    public void setHtml(boolean value)
+    {
+    	this._html = value;
+    }
+
     public String getBody() throws Exception
     {
         return _body;
diff --git a/CS2JLibrary/src/CS2JNet/System/Web/HttpException.java b/CS2JLibrary/src/CS2JNet/System/Web/HttpException.java
new file mode 100644
index 0000000..e2d296f
--- /dev/null
+++ b/CS2JLibrary/src/CS2JNet/System/Web/HttpException.java
@@ -0,0 +1,13 @@
+package RusticiSoftware.System.Web;
+
+public class HttpException extends Exception {
+	private int httpCode = -1;
+	public int GetHttpCode(){
+		return httpCode;
+	}
+	
+	public HttpException(int httpCode, String message){
+		super(message);
+		this.httpCode = httpCode;
+	}
+}