diff --git a/build.sbt b/build.sbt
index 18d83d9..d38a215 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,48 +1,48 @@
+val baseSettings = Seq(
+  scalaVersion := "2.11.8",
+  crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-RC2"),
+  version := "0.2.0",
+  name := "sourcecode"  ,
+  organization := "com.lihaoyi",
+  publishTo := Some("releases"  at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),
+  scmInfo := Some(ScmInfo(
+    browseUrl = url("https://github.com/lihaoyi/sourcecode"),
+    connection = "scm:git:git@github.com:lihaoyi/sourcecode.git"
+  )),
+  licenses := Seq("MIT" -> url("http://www.opensource.org/licenses/mit-license.html")),
+  developers += Developer(
+    email = "haoyi.sg@gmail.com",
+    id = "lihaoyi",
+    name = "Li Haoyi",
+    url = url("https://github.com/lihaoyi")
+  )
+)
+
+baseSettings
 
-crossScalaVersions := Seq("2.10.4", "2.11.7")
+def macroDependencies(version: String, binaryVersion: String) = {
+  val quasiquotes = 
+    if(binaryVersion == "2.10")
+      Seq(
+        compilerPlugin("org.scalamacros" % s"paradise" % "2.1.0" cross CrossVersion.full),
+        "org.scalamacros" %% s"quasiquotes" % "2.1.0"
+      )
+    else Seq()
 
-def macroDependencies(version: String) =
   Seq(
     "org.scala-lang" % "scala-reflect" % version % "provided",
     "org.scala-lang" % "scala-compiler" % version % "provided"
-  ) ++
-    (if (version startsWith "2.10.")
-      Seq(compilerPlugin("org.scalamacros" % s"paradise" % "2.0.0" cross CrossVersion.full),
-        "org.scalamacros" %% s"quasiquotes" % "2.0.0")
-    else
-      Seq())
+  ) ++ quasiquotes
+}
 
-lazy val sourcecode = crossProject.settings(
-  version := "0.1.2",
-  scalaVersion := "2.11.7",
-  name := "sourcecode"  ,
-  organization := "com.lihaoyi",
-  libraryDependencies ++= macroDependencies(scalaVersion.value),
+lazy val sourcecode = crossProject.settings(baseSettings).settings(
+  libraryDependencies ++= macroDependencies(scalaVersion.value, scalaBinaryVersion.value),
   unmanagedSourceDirectories in Compile ++= {
-    if (scalaVersion.value startsWith "2.10.") Seq(baseDirectory.value / ".."/"shared"/"src"/ "main" / "scala-2.10")
-    else Seq(baseDirectory.value / ".."/"shared" / "src" / "main" / "scala-2.11")
-  },
-  publishTo := Some("releases"  at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),
-
-  pomExtra :=
-    <url>https://github.com/lihaoyi/sourcecode</url>
-    <licenses>
-      <license>
-        <name>MIT license</name>
-        <url>http://www.opensource.org/licenses/mit-license.php</url>
-      </license>
-    </licenses>
-    <scm>
-      <url>git://github.com/lihaoyi/sourcecode.git</url>
-      <connection>scm:git://github.com/lihaoyi/sourcecode.git</connection>
-    </scm>
-    <developers>
-      <developer>
-        <id>lihaoyi</id>
-        <name>Li Haoyi</name>
-        <url>https://github.com/lihaoyi</url>
-      </developer>
-    </developers>
+    if (Set("2.11", "2.12.0-RC2").contains(scalaBinaryVersion.value)) 
+      Seq(baseDirectory.value / ".." / "shared" / "src" / "main" / "scala-2.11_2.12")
+    else
+      Seq()
+  }
 )
 
 lazy val js = sourcecode.js
diff --git a/project/build.properties b/project/build.properties
index 817bc38..59e7c05 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.11
\ No newline at end of file
diff --git a/project/build.sbt b/project/build.sbt
index 448bc06..d0ff6f4 100644
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
\ No newline at end of file
diff --git a/sourcecode/shared/src/main/scala-2.11/sourcecode/Compat.scala b/sourcecode/shared/src/main/scala-2.11_2.12/sourcecode/Compat.scala
similarity index 100%
rename from sourcecode/shared/src/main/scala-2.11/sourcecode/Compat.scala
rename to sourcecode/shared/src/main/scala-2.11_2.12/sourcecode/Compat.scala
diff --git a/sourcecode/shared/src/main/scala/sourcecode/SourceContext.scala b/sourcecode/shared/src/main/scala/sourcecode/SourceContext.scala
index 66d67f7..0c1a211 100644
--- a/sourcecode/shared/src/main/scala/sourcecode/SourceContext.scala
+++ b/sourcecode/shared/src/main/scala/sourcecode/SourceContext.scala
@@ -2,7 +2,6 @@ package sourcecode
 
 import language.experimental.macros
 
-
 object Util{
   def isSynthetic(c: Compat.Context)(s: c.Symbol) = isSyntheticName(getName(c)(s))
   def isSyntheticName(name: String) = {