diff --git a/.c9settings.xml b/.c9settings.xml
index 2d41d4af..d28e2675 100644
--- a/.c9settings.xml
+++ b/.c9settings.xml
@@ -1 +1 @@
-<settings version="0.0.2"   ><auto><configurations    debug="0"><config path="lib/ace/mode/java.js" name="java" args=""  /></configurations><panel>{"ext/editors/editors":{"parent":{"visible":2,"flex":1},"visible":2,"flex":1},"ext/tree/tree":{"parent":{"visible":2,"width":"200"},"visible":true,"flex":3,"state":"normal"},"ext/console/console":{"parent":{"visible":2,"height":200},"visible":true,"flex":1}}</panel><tree>["folder[1]","folder[1]/file[4]","folder[1]/folder[3]","folder[1]/folder[3]/folder[1]","folder[1]/folder[3]/folder[1]/folder[4]","folder[1]/folder[3]/folder[1]/folder[4]/file[18]","folder[1]/folder[3]/folder[1]/folder[4]/file[6]"]</tree><files active="/tomtasche/ace/workspace/editor.html"><file path="/tomtasche/ace/workspace/editor.html" type="file" size="8875" name="editor.html" contenttype="text/html; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_tomtasche/workspaces/ace/editor.html"/><file path="/tomtasche/ace/workspace/lib/ace/mode/java.js" type="file" size="603" name="java.js" contenttype="application/javascript; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_tomtasche/workspaces/ace/lib/ace/mode/java.js"/><file path="/tomtasche/ace/workspace/lib/ace/mode/javascript.js" type="file" size="5809" name="javascript.js" contenttype="application/javascript; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_tomtasche/workspaces/ace/lib/ace/mode/javascript.js"/></files></auto><general name="General" page="pgSettingsGeneral" saveallbeforerun="true"/><editors name="Editor" page="pgSettingsEditors"><code name="Code Editor" overwrite="false" selectstyle="line" activeline="true" showinvisibles="false" showprintmargin="true" printmargincolumn="80" softtabs="true" tabsize="4" scrollspeed="2"/></editors></settings>
\ No newline at end of file
+<settings version="0.0.2"   ><auto><configurations   /><panel>{"ext/editors/editors":{"parent":{"visible":2,"flex":1},"visible":2,"flex":1},"ext/tree/tree":{"parent":{"visible":2,"width":"200"},"visible":true,"flex":3,"state":"normal"},"ext/console/console":{"parent":{"visible":2,"height":"41"},"visible":false,"flex":1}}</panel><tree>["folder[1]"]</tree><files active="/tomtasche/ace/workspace/gitignore"><file path="/tomtasche/ace/workspace/gitignore" type="file" size="11" name="gitignore" contenttype="text/plain; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_tomtasche/workspaces/ace/gitignore"/></files></auto><general name="General" page="pgSettingsGeneral" saveallbeforerun="true"/><editors name="Editor" page="pgSettingsEditors"><code name="Code Editor" overwrite="false" selectstyle="line" activeline="true" showinvisibles="false" showprintmargin="true" printmargincolumn="80" softtabs="true" tabsize="4" scrollspeed="2"/></editors></settings>
\ No newline at end of file
diff --git a/editor.html b/editor.html
index adca4870..93684441 100644
--- a/editor.html
+++ b/editor.html
@@ -140,7 +140,7 @@
 
     <script type="text/editor" id="javatext">public class InfiniteLoop {
         
-    /**
+    /*
      * This will cause the program to hang...
      * 
      * Taken from:
diff --git a/lib/ace/mode/java_highlight_rules.js b/lib/ace/mode/java_highlight_rules.js
index 712f8839..a120ea2b 100644
--- a/lib/ace/mode/java_highlight_rules.js
+++ b/lib/ace/mode/java_highlight_rules.js
@@ -38,7 +38,11 @@ JavaHighlightRules = function() {
 	            regex : "\\/\\/.*$"
 	        },
 	        docComment.getStartRule("doc-start"),
-	        {
+            {
+                token : "comment", // multi line comment
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
 	            token : "comment", // multi line comment
 	            regex : "\\/\\*\\*",
 	            next : "comment"