diff --git a/build.xml b/build.xml
index fc4987e..7334c5a 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
   <property name="project.lib" value="${project.dir}/lib"/>
   <property name="project.dest" value="${project.dir}/out/production/clojure-plugin"/>
   <property name="test.dest" value="${project.dir}/out/test/clojure-plugin"/>
-  <property name="output" value="${project.dir}/dist"/>
+  <property name="test.dist" value="${project.dir}/test_dist"/>
   <property name="idea.pack" value="${project.dir}/idea_pack"/>
   <property name="tools.jar.dir" value="${java.home}/lib"/>
 
@@ -169,13 +169,13 @@
       </fileset>
     </copy>
 
-    <mkdir dir="${output}"/>
+    <mkdir dir="${test.dist}"/>
 
-    <zip destfile="${output}/clojure-intellij-bin-${plugin.version}.zip" basedir="${project.dir}/tempjar"/>
+    <zip destfile="${test.dist}/clojure-intellij-bin-${plugin.version}.zip" basedir="${project.dir}/tempjar"/>
     <delete dir="${project.dir}/tempjar"/>
 
     <!-- Zip sources-->
-    <zip destfile="${output}/clojure-intellij-src-${plugin.version}.zip" basedir="${project.dir}"
+    <zip destfile="${test.dist}/clojure-intellij-src-${plugin.version}.zip" basedir="${project.dir}"
          includes="src/**/*.java,
          src/**/*.properties,
          src/**/*.flex,
@@ -216,11 +216,12 @@
   <target name="run.tests" depends="build.tests">
 
     <mkdir dir="${project.dir}/logs"/>
-    <mkdir dir="${output}/config"/>
-    <mkdir dir="${output}/system"/>
+    <mkdir dir="${test.dist}/config"/>
+    <mkdir dir="${test.dist}/system"/>
 
     <junit fork="yes"
            dir="${project.dir}"
+           showoutput="yes"
            printsummary="yes"
            haltonfailure="no"
            haltonerror="no">
@@ -236,12 +237,12 @@
       <jvmarg value="-Djava.awt.headless=true"/>
       <jvmarg value="-Xmx256M"/>
       <jvmarg value="-ea"/>
-      <jvmarg value="-Xdebug"/>
       <jvmarg value="-Djava.compiler=NONE"/>
+      <jvmarg value="-Xdebug"/>
       <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5549"/>
 
-      <jvmarg value="-Didea.config.path=${output}/config"/>
-      <jvmarg value="-Didea.system.path=${output}/system"/>
+      <jvmarg value="-Didea.config.path=${test.dist}/config"/>
+      <jvmarg value="-Didea.system.path=${test.dist}/system"/>
       <jvmarg value="-Didea.plugins.path=${project.dest}/.."/>
 
       <jvmarg value="-Didea.load.plugins.id=org.intellij.clojure"/>
@@ -256,7 +257,7 @@
       </batchtest>
     </junit>
 
-    <delete dir="${output}"/>
+    <delete dir="${test.dist}"/>
   </target>
 
 </project>
diff --git a/src/org/jetbrains/plugins/clojure/config/ClojureVersion.java b/src/org/jetbrains/plugins/clojure/config/ClojureVersion.java
index 5b58504..f387676 100644
--- a/src/org/jetbrains/plugins/clojure/config/ClojureVersion.java
+++ b/src/org/jetbrains/plugins/clojure/config/ClojureVersion.java
@@ -18,8 +18,13 @@ public enum ClojureVersion {
 
   Clojure_1_1_0("1.1.0", new LibraryInfo[]{
       createJarDownloadInfo("clojure.jar", "1.1.0", "clojure.main"),
+  }),
+
+  Clojure_1_2("1.2", new LibraryInfo[]{
+      createJarDownloadInfo("clojure.jar", "1.2", "clojure.main"),
   });
 
+
   private final String myName;
   private final LibraryInfo[] myJars;
 
diff --git a/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java b/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java
index 9d91968..0985caa 100644
--- a/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java
+++ b/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.1 on 11/28/10 9:27 PM */
+/* The following code was generated by JFlex 1.4.1 on 12/15/10 5:38 PM */
 
 /*
  * Copyright 2000-2009 Red Shark Technology
@@ -27,7 +27,7 @@
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.1
- * on 11/28/10 9:27 PM from the specification file
+ * on 12/15/10 5:38 PM from the specification file
  * <tt>src/org/jetbrains/plugins/clojure/lexer/clojure.flex</tt>
  */
 public class _ClojureLexer implements ClojureTokenTypes, FlexLexer {