diff --git a/jquery.cleditor.bbcode.js b/jquery.cleditor.bbcode.js
index 6c92d7f..b0ed59d 100644
--- a/jquery.cleditor.bbcode.js
+++ b/jquery.cleditor.bbcode.js
@@ -1,134 +1,203 @@
-/**
- @preserve CLEditor BBCode Plugin v1.0.0
- http://premiumsoftware.net/cleditor
- requires CLEditor v1.3.0 or later
- 
- Copyright 2010, Chris Landowski, Premium Software, LLC
- Dual licensed under the MIT or GPL Version 2 licenses.
-*/
-
-// ==ClosureCompiler==
-// @compilation_level SIMPLE_OPTIMIZATIONS
-// @output_file_name jquery.cleditor.bbcode.min.js
-// ==/ClosureCompiler==
-
-/*
-
-  The CLEditor useCSS optional parameter should be set to false for this plugin
-  to function properly.
-
-  Supported HTML and BBCode Tags:
-
-  Bold              <b>Hello</b>
-                    [b]Hello[/b]
-  Italics           <i>Hello</i>
-                    [i]Hello[/i]
-  Underlined        <u>Hello</u>
-                    [u]Hello[/u]
-  Strikethrough     <strike>Hello</strike>
-                    [s]Hello[/s]
-  Unordered Lists   <ul><li>Red</li><li>Blue</li><li>Green</li></ul>
-                    [list][*]Red[/*][*]Green[/*][*]Blue[/*][/list]
-  Ordered Lists     <ol><li>Red</li><li>Blue</li><li>Green</li></ol>
-                    [list=1][*]Red[/*][*]Green[/*][*]Blue[/*][/list]
-  Images            <img src="http://premiumsoftware.net/image.jpg">
-                    [img]http://premiumsoftware.net/image.jpg[/img]
-  Links             <a href="http://premiumsoftware.net">Premium Software</a>
-                    [url=http://premiumsoftware.net]Premium Software[/url]
-
-*/
-
-(function($) {
-
-  // BBCode only supports a small subset of HTML, so remove
-  // any toolbar buttons that are not currently supported.
-  $.cleditor.defaultOptions.controls =
-    "bold italic underline strikethrough removeformat | bullets numbering | " +
-    "undo redo | image link unlink | cut copy paste pastetext | print source";
-
-  // Save the previously assigned callback handlers
-  var oldAreaCallback = $.cleditor.defaultOptions.updateTextArea;
-  var oldFrameCallback = $.cleditor.defaultOptions.updateFrame;
-
-  // Wireup the updateTextArea callback handler
-  $.cleditor.defaultOptions.updateTextArea = function(html) {
-
-    // Fire the previously assigned callback handler
-    if (oldAreaCallback)
-      html = oldAreaCallback(html);
-
-    // Convert the HTML to BBCode
-    return $.cleditor.convertHTMLtoBBCode(html);
-
-  }
-
-  // Wireup the updateFrame callback handler
-  $.cleditor.defaultOptions.updateFrame = function(code) {
-
-    // Fire the previously assigned callback handler
-    if (oldFrameCallback)
-      code = oldFrameCallback(code);
-
-    // Convert the BBCode to HTML
-    return $.cleditor.convertBBCodeToHTML(code);
-
-  }
-
-  // Expose the convertHTMLtoBBCode method
-  $.cleditor.convertHTMLtoBBCode = function(html) {
-		
-    $.each([
-      [/[\r|\n]/g, ""],
-      [/<br.*?>/gi, "\n"],
-      [/<b>(.*?)<\/b>/gi, "[b]$1[/b]"],
-      [/<strong>(.*?)<\/strong>/gi, "[b]$1[/b]"],
-      [/<i>(.*?)<\/i>/gi, "[i]$1[/i]"],
-      [/<em>(.*?)<\/em>/gi, "[i]$1[/i]"],
-      [/<u>(.*?)<\/u>/gi, "[u]$1[/u]"],
-      [/<ins>(.*?)<\/ins>/gi, "[u]$1[/u]"],
-      [/<strike>(.*?)<\/strike>/gi, "[s]$1[/s]"],
-      [/<del>(.*?)<\/del>/gi, "[s]$1[/s]"],
-      [/<a.*?href="(.*?)".*?>(.*?)<\/a>/gi, "[url=$1]$2[/url]"],
-      [/<img.*?src="(.*?)".*?>/gi, "[img]$1[/img]"],
-      [/<ul>/gi, "[list]"],
-      [/<\/ul>/gi, "[/list]"],
-      [/<ol>/gi, "[list=1]"],
-      [/<\/ol>/gi, "[/list]"],
-      [/<li>/gi, "[*]"],
-      [/<\/li>/gi, "[/*]"],
-      [/<.*?>(.*?)<\/.*?>/g, "$1"]
-      ], function(index, item) {
-        html = html.replace(item[0], item[1]);
-      });
-
-    return html;
-
-  }
-
-  // Expose the convertBBCodeToHTML method
-  $.cleditor.convertBBCodeToHTML = function(code) {
-
-    $.each([
-      [/\r/g, ""],
-      [/\n/g, "<br />"],
-      [/\[b\](.*?)\[\/b\]/gi, "<b>$1</b>"],
-      [/\[i\](.*?)\[\/i\]/gi, "<i>$1</i>"],
-      [/\[u\](.*?)\[\/u\]/gi, "<u>$1</u>"],
-      [/\[s\](.*?)\[\/s\]/gi, "<strike>$1</strike>"],
-      [/\[url=(.*?)\](.*?)\[\/url\]/gi, "<a href=\"$1\">$2</a>"],
-      [/\[img\](.*?)\[\/img\]/gi, "<img src=\"$1\">"],
-      [/\[list\](.*?)\[\/list\]/gi, "<ul>$1</ul>"],
-      [/\[list=1\](.*?)\[\/list\]/gi, "<ol>$1</ol>"],
-      [/\[list\]/gi, "<ul>"],
-      [/\[list=1\]/gi, "<ol>"],
-      [/\[\*\](.*?)\[\/\*\]/g, "<li>$1</li>"],
-      [/\[\*\]/g, "<li>"]
-      ], function(index, item) {
-        code = code.replace(item[0], item[1]);
-      });
-
-    return code;
-
-  }
-
-})(jQuery);
\ No newline at end of file
+/**
+ @preserve CLEditor BBCode Plugin v1.0.0
+ http://premiumsoftware.net/cleditor
+ requires CLEditor v1.3.0 or later
+ 
+ Copyright 2010, Chris Landowski, Premium Software, LLC
+ Dual licensed under the MIT or GPL Version 2 licenses.
+*/
+
+// ==ClosureCompiler==
+// @compilation_level SIMPLE_OPTIMIZATIONS
+// @output_file_name jquery.cleditor.bbcode.min.js
+// ==/ClosureCompiler==
+
+/*
+
+  The CLEditor useCSS optional parameter should be set to false for this plugin
+  to function properly.
+
+  Supported HTML and BBCode Tags:
+
+  Bold              <b>Hello</b>
+                    [b]Hello[/b]
+  Italics           <i>Hello</i>
+                    [i]Hello[/i]
+  Underlined        <u>Hello</u>
+                    [u]Hello[/u]
+  Strikethrough     <strike>Hello</strike>
+                    [s]Hello[/s]
+  Font              <font face="Impact">Hello</font>
+                    [font=impact]Hello[/font]
+  Color             <font color="#ff00ff">Hello</font>
+                    [color=ff00ff]Hello[/color]
+  Size              <font size="6">Hello</font>
+                    [size=6]Hello[/size]
+  Unordered Lists   <ul><li>Red</li><li>Blue</li><li>Green</li></ul>
+                    [list][*]Red[/*][*]Green[/*][*]Blue[/*][/list]
+  Ordered Lists     <ol><li>Red</li><li>Blue</li><li>Green</li></ol>
+                    [list=1][*]Red[/*][*]Green[/*][*]Blue[/*][/list]
+  Images            <img src="http://premiumsoftware.net/image.jpg">
+                    [img]http://premiumsoftware.net/image.jpg[/img]
+  Links             <a href="http://premiumsoftware.net">Premium Software</a>
+                    [url=http://premiumsoftware.net]Premium Software[/url]
+
+*/
+/*
+2011-07-09 Sam Clarke <sam@samcalrke.com>:
+		Added color tag
+		Added font tag
+		Added size tag
+		Changed so that <> will be converted to &lt;&gt; when going from source to WYSIWYG stopping HTML from being manually entered when in BBCode mode
+		Fixed &nbsp; not being converted to a space in source view
+		Fixed div tags sometimes not being removed in chrome when contents is multi-line
+ */
+
+(function($)
+{
+	// BBCode only supports a small subset of HTML, so remove
+	// any toolbar buttons that are not currently supported.
+	$.cleditor.defaultOptions.controls =
+		"bold italic underline strikethrough removeformat | font color size | bullets numbering | " +
+		"undo redo | image link unlink | cut copy paste pastetext | print source";
+
+	// Save the previously assigned callback handlers
+	var oldAreaCallback = $.cleditor.defaultOptions.updateTextArea;
+	var oldFrameCallback = $.cleditor.defaultOptions.updateFrame;
+
+	// Wireup the updateTextArea callback handler
+	$.cleditor.defaultOptions.updateTextArea = function(html)
+	{
+		// Fire the previously assigned callback handler
+		if (oldAreaCallback)
+			html = oldAreaCallback(html);
+
+		// Convert the HTML to BBCode
+		return $.cleditor.convertHTMLtoBBCode(html);
+
+	}
+
+	// Wireup the updateFrame callback handler
+	$.cleditor.defaultOptions.updateFrame = function(code)
+	{
+		// Fire the previously assigned callback handler
+		if (oldFrameCallback)
+			code = oldFrameCallback(code);
+
+		// Convert the BBCode to HTML
+		return $.cleditor.convertBBCodeToHTML(code);
+	}
+
+	// Expose the convertHTMLtoBBCode method
+	$.cleditor.convertHTMLtoBBCode = function(html)
+	{
+		$.each([
+				[/<b>/gi, "[b]"],
+				[/<\/b>/gi, "[/b]"],
+				[/<strong>/gi, "[b]"],
+				[/<\/strong>/gi, "[/b]"],
+				[/<i>/gi, "[i]"],
+				[/<\/i>/gi, "[/i]"],
+				[/<em>/gi, "[i]"],
+				[/<\/em>/gi, "[/i]"],
+				[/<u>/gi, "[u]"],
+				[/<\/u>/gi, "[/u]"],
+				[/<ins>/gi, "[u]"],
+				[/<\/ins>/gi, "[/u]"],
+				[/<strike>/gi, "[s]"],
+				[/<\/strike>/gi, "[/s]"],
+				[/<del>/gi, "[s]"],
+				[/<\/del>/gi, "[/s]"],
+				[/<a[^>]*?href="([^"]*?)".*?>([\s\S]*?)<\/a>/gi, "[url=$1]$2[/url]"],
+				[/<img[^>]*?src="([^"]*?)"[^>]*?>/gi, "[img]$1[/img]"],
+				[/<ul>/gi, "[list]"],
+				[/<\/ul>/gi, "[/list]"],
+				[/<ol>/gi, "[list=1]"],
+				[/<\/ol>/gi, "[/list]"],
+				[/<li>/gi, "[*]"],
+				[/<\/li>/gi, "[/*]"],
+
+				// new font bbcodes. They are complicated and ugly but on the plus side they do handle nesting correctly! :)
+				[/<font[^>]*?color="?([^">]*?)"?>((?:[\s\S](?!<font[^>]*?color))*?)<\/font>/gi, "[color=$1]$2[/color]"],
+				[/<font[^>]*?size="?([^">]*?)"?>((?:[\s\S](?!<font[^>]*?size))*?)<\/font>/gi, "[size=$1]$2[/size]"],
+				[/<font[^>]*?face="?'?([^'">]*?)'?"?>((?:[\s\S](?!<font[^>]*?face))*?)<\/font>/gi, "[font=$1]$2[/font]"],
+
+				// line breaks
+				[/[\r|\n]/g, ""],
+				[/<\/p>/gi, "\n"],
+				[/<div><br[^>]*?>/gi, ""],	// divs seem to alias paragraphs in chrome. When you create a blank line it fills
+								// the divs with a br which causes duplicate line-breaks. One for the paragraph (div)
+								// and one for the BR. To fix remove the br if all that is contained in it
+				[/<\/div>/gi, "\n"], // divs seem to paragraphs in chrome so treat them like it
+				[/<br[^>]*?>/gi, "\n"],
+
+				//remove any leftover html
+				[/<[^>]*?>/g, ""],
+
+				// HTML elements
+				[/&nbsp;|\u00a0/gi, " "],
+				[/&amp;/gi, "&"],
+				[/&lt;/gi, "<"],
+				[/&gt;/gi, ">"],
+				[/&quot;/gi, "\""]
+			],
+			function(index, item)
+			{
+				// Keep running the replace untill all matches are
+				// replaced. Needed for the nested bbcodes.
+				var oldHtml=html;
+
+				while((html = html.replace(item[0],item[1])) != oldHtml)
+					oldHtml=html;
+			});
+
+		return html;
+	}
+
+	// Expose the convertBBCodeToHTML method
+	$.cleditor.convertBBCodeToHTML = function(code)
+	{
+		$.each([
+			[/&/g, "&amp;"],
+			[/</g, "&lt;"],
+			[/>/g, "&gt;"],
+			[/\r/g, ""],
+			[/\n/g, "<br />"],
+
+			[/\[color=([^\]]*?)\]/gi, "<font color=\"$1\">"],
+			[/\[\/color\]/gi, "</font>"],
+			[/\[size=([^\]]*?)\]/gi, "<font size=\"$1\">"],
+			[/\[\/size\]/gi, "</font>"],
+			[/\[font=([^\]]*?)\]/gi, "<font face=\"$1\">"],
+			[/\[\/font\]/gi, "</font>"],
+
+			[/\[b\]/gi, "<strong>"],
+			[/\[\/b\]/gi, "</strong>"],
+			[/\[i\]/gi, "<em>"],
+			[/\[\/i\]/gi, "</em>"],
+			[/\[u\]/gi, "<u>"],
+			[/\[\/u\]/gi, "</u>"],
+			[/\[s\]/gi, "<strike>"],
+			[/\[\/s\]/gi, "</strike>"],
+
+			[/\[url=(.*?)\](.*?)\[\/url\]/gi, "<a href=\"$1\">$2</a>"],
+			[/\[url\](.*?)\[\/url\]/gi, "<a href=\"$1\">$1</a>"],
+			[/\[img\](.*?)\[\/img\]/gi, "<img src=\"$1\">"],
+			[/\[list\](.*?)\[\/list\]/gi, "<ul>$1</ul>"],
+			[/\[list=1\](.*?)\[\/list\]/gi, "<ol>$1</ol>"],
+			[/\[list\]/gi, "<ul>"],
+			[/\[list=1\]/gi, "<ol>"],
+			[/\[\*\](.*?)\[\/\*\]/g, "<li>$1</li>"],
+			[/\[\*\]/g, "<li>"],
+
+			// replace all double spaces not inside HTML
+			[/  (?=([^\<\>]*?<|[^\<\>]*?$))/g, "&nbsp;&nbsp;"]
+		], 
+		function(index, item)
+		{
+			code = code.replace(item[0], item[1]);
+		});
+
+		return code;
+	}
+})(jQuery);
diff --git a/jquery.cleditor.bbcode.min.js b/jquery.cleditor.bbcode.min.js
new file mode 100644
index 0000000..35c64a2
--- /dev/null
+++ b/jquery.cleditor.bbcode.min.js
@@ -0,0 +1,14 @@
+/*
+ CLEditor BBCode Plugin v1.0.0
+ http://premiumsoftware.net/cleditor
+ requires CLEditor v1.3.0 or later
+
+ Copyright 2010, Chris Landowski, Premium Software, LLC
+ Dual licensed under the MIT or GPL Version 2 licenses.
+*/
+(function(b){b.cleditor.defaultOptions.controls="bold italic underline strikethrough removeformat | font color size | bullets numbering | undo redo | image link unlink | cut copy paste pastetext | print source";var c=b.cleditor.defaultOptions.updateTextArea,d=b.cleditor.defaultOptions.updateFrame;b.cleditor.defaultOptions.updateTextArea=function(a){c&&(a=c(a));return b.cleditor.convertHTMLtoBBCode(a)};b.cleditor.defaultOptions.updateFrame=function(a){d&&(a=d(a));return b.cleditor.convertBBCodeToHTML(a)};
+b.cleditor.convertHTMLtoBBCode=function(a){b.each([[/<b>/gi,"[b]"],[/<\/b>/gi,"[/b]"],[/<strong>/gi,"[b]"],[/<\/strong>/gi,"[/b]"],[/<i>/gi,"[i]"],[/<\/i>/gi,"[/i]"],[/<em>/gi,"[i]"],[/<\/em>/gi,"[/i]"],[/<u>/gi,"[u]"],[/<\/u>/gi,"[/u]"],[/<ins>/gi,"[u]"],[/<\/ins>/gi,"[/u]"],[/<strike>/gi,"[s]"],[/<\/strike>/gi,"[/s]"],[/<del>/gi,"[s]"],[/<\/del>/gi,"[/s]"],[/<a[^>]*?href="([^"]*?)".*?>([\s\S]*?)<\/a>/gi,"[url=$1]$2[/url]"],[/<img[^>]*?src="([^"]*?)"[^>]*?>/gi,"[img]$1[/img]"],[/<ul>/gi,"[list]"],
+[/<\/ul>/gi,"[/list]"],[/<ol>/gi,"[list=1]"],[/<\/ol>/gi,"[/list]"],[/<li>/gi,"[*]"],[/<\/li>/gi,"[/*]"],[/<font[^>]*?color="?([^">]*?)"?>((?:[\s\S](?!<font[^>]*?color))*?)<\/font>/gi,"[color=$1]$2[/color]"],[/<font[^>]*?size="?([^">]*?)"?>((?:[\s\S](?!<font[^>]*?size))*?)<\/font>/gi,"[size=$1]$2[/size]"],[/<font[^>]*?face="?'?([^'">]*?)'?"?>((?:[\s\S](?!<font[^>]*?face))*?)<\/font>/gi,"[font=$1]$2[/font]"],[/[\r|\n]/g,""],[/<\/p>/gi,"\n"],[/<div><br[^>]*?>/gi,""],[/<\/div>/gi,"\n"],[/<br[^>]*?>/gi,
+"\n"],[/<[^>]*?>/g,""],[/&nbsp;|\u00a0/gi," "],[/&amp;/gi,"&"],[/&lt;/gi,"<"],[/&gt;/gi,">"],[/&quot;/gi,'"']],function(b,e){for(var c=a;(a=a.replace(e[0],e[1]))!=c;)c=a});return a};b.cleditor.convertBBCodeToHTML=function(a){b.each([[/&/g,"&amp;"],[/</g,"&lt;"],[/>/g,"&gt;"],[/\r/g,""],[/\n/g,"<br />"],[/\[color=([^\]]*?)\]/gi,'<font color="$1">'],[/\[\/color\]/gi,"</font>"],[/\[size=([^\]]*?)\]/gi,'<font size="$1">'],[/\[\/size\]/gi,"</font>"],[/\[font=([^\]]*?)\]/gi,'<font face="$1">'],[/\[\/font\]/gi,
+"</font>"],[/\[b\]/gi,"<strong>"],[/\[\/b\]/gi,"</strong>"],[/\[i\]/gi,"<em>"],[/\[\/i\]/gi,"</em>"],[/\[u\]/gi,"<u>"],[/\[\/u\]/gi,"</u>"],[/\[s\]/gi,"<strike>"],[/\[\/s\]/gi,"</strike>"],[/\[url=(.*?)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>'],[/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>'],[/\[img\](.*?)\[\/img\]/gi,'<img src="$1">'],[/\[list\](.*?)\[\/list\]/gi,"<ul>$1</ul>"],[/\[list=1\](.*?)\[\/list\]/gi,"<ol>$1</ol>"],[/\[list\]/gi,"<ul>"],[/\[list=1\]/gi,"<ol>"],[/\[\*\](.*?)\[\/\*\]/g,"<li>$1</li>"],
+[/\[\*\]/g,"<li>"],[/  (?=([^\<\>]*?<|[^\<\>]*?$))/g,"&nbsp;&nbsp;"]],function(b,c){a=a.replace(c[0],c[1])});return a}})(jQuery);
\ No newline at end of file