diff --git a/LICENSE b/LICENSE
index 28dd3411..836bf3d8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-Copyright (c) 2012-2013 EPFL
-Copyright (c) 2012-2013 Typesafe, Inc.
+Copyright (C) 2012-2014 EPFL
+Copyright (C) 2012-2014 Typesafe, Inc.
 
 All rights reserved.
 
diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index b02fa6a4..17a63a47 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
index 8518cf54..d879c7b8 100644
--- a/src/main/scala/scala/async/internal/AnfTransform.scala
+++ b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncAnalysis.scala b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
index 69e4c3ca..76c2dbac 100644
--- a/src/main/scala/scala/async/internal/AsyncAnalysis.scala
+++ b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncBase.scala b/src/main/scala/scala/async/internal/AsyncBase.scala
index 3bb3b997..ebedcbd5 100644
--- a/src/main/scala/scala/async/internal/AsyncBase.scala
+++ b/src/main/scala/scala/async/internal/AsyncBase.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncId.scala b/src/main/scala/scala/async/internal/AsyncId.scala
index 5343a824..f9d8c0b5 100644
--- a/src/main/scala/scala/async/internal/AsyncId.scala
+++ b/src/main/scala/scala/async/internal/AsyncId.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncUtils.scala b/src/main/scala/scala/async/internal/AsyncUtils.scala
index 8700bd68..1d15c4c3 100644
--- a/src/main/scala/scala/async/internal/AsyncUtils.scala
+++ b/src/main/scala/scala/async/internal/AsyncUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 package scala.async.internal
 
diff --git a/src/main/scala/scala/async/internal/ExprBuilder.scala b/src/main/scala/scala/async/internal/ExprBuilder.scala
index b0cd9145..5314ae0e 100644
--- a/src/main/scala/scala/async/internal/ExprBuilder.scala
+++ b/src/main/scala/scala/async/internal/ExprBuilder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 package scala.async.internal
 
diff --git a/src/main/scala/scala/async/internal/FutureSystem.scala b/src/main/scala/scala/async/internal/FutureSystem.scala
index 166affe4..46c0bcf2 100644
--- a/src/main/scala/scala/async/internal/FutureSystem.scala
+++ b/src/main/scala/scala/async/internal/FutureSystem.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 package scala.async.internal
 
diff --git a/src/main/scala/scala/async/internal/StateAssigner.scala b/src/main/scala/scala/async/internal/StateAssigner.scala
index cdde7a48..8f0d5180 100644
--- a/src/main/scala/scala/async/internal/StateAssigner.scala
+++ b/src/main/scala/scala/async/internal/StateAssigner.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index e382c62b..45baa48b 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 package scala.async.internal
 
diff --git a/src/test/scala/scala/async/TestLatch.scala b/src/test/scala/scala/async/TestLatch.scala
index a119a433..5b771d8f 100644
--- a/src/test/scala/scala/async/TestLatch.scala
+++ b/src/test/scala/scala/async/TestLatch.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala
index b42726b6..8261898c 100644
--- a/src/test/scala/scala/async/TreeInterrogation.scala
+++ b/src/test/scala/scala/async/TreeInterrogation.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
index ae346a2f..240e0889 100644
--- a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
+++ b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala
index deac0697..9778c723 100644
--- a/src/test/scala/scala/async/neg/NakedAwait.scala
+++ b/src/test/scala/scala/async/neg/NakedAwait.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/neg/SampleNegSpec.scala b/src/test/scala/scala/async/neg/SampleNegSpec.scala
index e57dae98..438003d1 100644
--- a/src/test/scala/scala/async/neg/SampleNegSpec.scala
+++ b/src/test/scala/scala/async/neg/SampleNegSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/package.scala b/src/test/scala/scala/async/package.scala
index 98d22568..974a989f 100644
--- a/src/test/scala/scala/async/package.scala
+++ b/src/test/scala/scala/async/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala
diff --git a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
index 728f33ba..757ae0bc 100644
--- a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
+++ b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/await0/Await0Spec.scala b/src/test/scala/scala/async/run/await0/Await0Spec.scala
index 2adaa09a..61978fb0 100644
--- a/src/test/scala/scala/async/run/await0/Await0Spec.scala
+++ b/src/test/scala/scala/async/run/await0/Await0Spec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
@@ -7,7 +7,7 @@ package run
 package await0
 
 /**
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 import language.{reflectiveCalls, postfixOps}
diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
index 677cce8d..1d108589 100644
--- a/src/test/scala/scala/async/run/block0/AsyncSpec.scala
+++ b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala
index f42b0730..4f70a36f 100644
--- a/src/test/scala/scala/async/run/block1/block1.scala
+++ b/src/test/scala/scala/async/run/block1/block1.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala b/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
index b417dd65..57d53e4e 100644
--- a/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
+++ b/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala
index 491b43fe..1761db50 100644
--- a/src/test/scala/scala/async/run/futures/FutureSpec.scala
+++ b/src/test/scala/scala/async/run/futures/FutureSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/hygiene/Hygiene.scala b/src/test/scala/scala/async/run/hygiene/Hygiene.scala
index f11d21e6..ba1557dc 100644
--- a/src/test/scala/scala/async/run/hygiene/Hygiene.scala
+++ b/src/test/scala/scala/async/run/hygiene/Hygiene.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
index 4a86d822..2ecfbdba 100644
--- a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
+++ b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala b/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
index 76e6b1e1..24dc50a7 100644
--- a/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
+++ b/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
index 41b81a46..587aaac0 100644
--- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
+++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
index 3fc4d3b4..d40b48d5 100644
--- a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
+++ b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
index 8e6e1bbf..24ddf08e 100644
--- a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
+++ b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala b/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala
index 7d62f804..17d33af7 100644
--- a/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala
+++ b/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/match0/Match0.scala b/src/test/scala/scala/async/run/match0/Match0.scala
index 418275ee..8eead712 100644
--- a/src/test/scala/scala/async/run/match0/Match0.scala
+++ b/src/test/scala/scala/async/run/match0/Match0.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala b/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
index 0adb5066..8bf480bc 100644
--- a/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
+++ b/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/toughtype/ToughType.scala b/src/test/scala/scala/async/run/toughtype/ToughType.scala
index 15518563..6159f7b1 100644
--- a/src/test/scala/scala/async/run/toughtype/ToughType.scala
+++ b/src/test/scala/scala/async/run/toughtype/ToughType.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package scala.async