diff --git a/src/benchmark/PersistenceBenchmark/Properties/AssemblyInfo.cs b/src/benchmark/PersistenceBenchmark/Properties/AssemblyInfo.cs
index 73194667ec8..a740b29ee70 100644
--- a/src/benchmark/PersistenceBenchmark/Properties/AssemblyInfo.cs
+++ b/src/benchmark/PersistenceBenchmark/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/benchmark/PingPong/ClientAsyncActor.cs b/src/benchmark/PingPong/ClientAsyncActor.cs
index 8f1d2be0290..0fc420f4206 100644
--- a/src/benchmark/PingPong/ClientAsyncActor.cs
+++ b/src/benchmark/PingPong/ClientAsyncActor.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/LeastShardAllocationStrategySpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/LeastShardAllocationStrategySpec.cs
index f1f701a1391..cc3370f17ee 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/LeastShardAllocationStrategySpec.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/LeastShardAllocationStrategySpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Properties/AssemblyInfo.cs
index 5f5029bda60..8971c492391 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs
index 72e151aa14e..109d726dbf6 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Collections.Immutable;
using Akka.Actor;
using Akka.Persistence;
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs
index 720c1a5ff3c..389eeaafcb6 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs
index af9e57c05e2..edaf36fcf4a 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs
index 7469e29d357..5abc857377e 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs
index 99dcdb7c3b6..8ead5594c95 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
// Generated by ProtoGen, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589. DO NOT EDIT!
#pragma warning disable 1591, 0612, 3021
#region Designer generated code
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs
index 9a49340c387..eb1dc429719 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Collections.Generic;
using Akka.Actor;
diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Properties/AssemblyInfo.cs
index 2d88700b66f..73e102850e1 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/ClusterClientMessageSerializer.cs b/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/ClusterClientMessageSerializer.cs
index 8b8a53d503f..f14c1a7c047 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/ClusterClientMessageSerializer.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/ClusterClientMessageSerializer.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Collections.Generic;
using System.Linq;
using Akka.Actor;
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/Proto/ClusterClientMessages.cs b/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/Proto/ClusterClientMessages.cs
index 32cb5c31a53..311782e922a 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/Proto/ClusterClientMessages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Client/Serialization/Proto/ClusterClientMessages.cs
@@ -1,4 +1,11 @@
-// Generated by ProtoGen, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589. DO NOT EDIT!
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+// Generated by ProtoGen, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589. DO NOT EDIT!
#pragma warning disable 1591, 0612, 3021
#region Designer generated code
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs
index f4e89ba03c2..f5961ec7d5b 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/Proto/DistributedPubSubMessages.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/Proto/DistributedPubSubMessages.cs
index 5a0df5e5446..35249587f41 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/Proto/DistributedPubSubMessages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/Proto/DistributedPubSubMessages.cs
@@ -1,4 +1,11 @@
-// Generated by ProtoGen, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589. DO NOT EDIT!
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+// Generated by ProtoGen, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589. DO NOT EDIT!
#pragma warning disable 1591, 0612, 3021
#region Designer generated code
diff --git a/src/contrib/dependencyInjection/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs b/src/contrib/dependencyInjection/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs
index d15b93e990b..fff164f106d 100644
--- a/src/contrib/dependencyInjection/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/dependencyInjection/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/dependencyInjection/Akka.DI.CastleWindsor.Tests/Properties/AssemblyInfo.cs b/src/contrib/dependencyInjection/Akka.DI.CastleWindsor.Tests/Properties/AssemblyInfo.cs
index b7a933d2ebe..ea4a062bfd1 100644
--- a/src/contrib/dependencyInjection/Akka.DI.CastleWindsor.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/dependencyInjection/Akka.DI.CastleWindsor.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/dependencyInjection/Akka.DI.Ninject.Tests/Properties/AssemblyInfo.cs b/src/contrib/dependencyInjection/Akka.DI.Ninject.Tests/Properties/AssemblyInfo.cs
index 10e77808bd0..e775b0c7ab4 100644
--- a/src/contrib/dependencyInjection/Akka.DI.Ninject.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/dependencyInjection/Akka.DI.Ninject.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/dependencyInjection/Akka.DI.StructureMap.Tests/Properties/AssemblyInfo.cs b/src/contrib/dependencyInjection/Akka.DI.StructureMap.Tests/Properties/AssemblyInfo.cs
index 51f2fb16eb0..3c272ea7fc2 100644
--- a/src/contrib/dependencyInjection/Akka.DI.StructureMap.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/dependencyInjection/Akka.DI.StructureMap.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/dependencyInjection/Akka.DI.Unity.Tests/Properties/AssemblyInfo.cs b/src/contrib/dependencyInjection/Akka.DI.Unity.Tests/Properties/AssemblyInfo.cs
index b6869d95133..0870bde24ef 100644
--- a/src/contrib/dependencyInjection/Akka.DI.Unity.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/dependencyInjection/Akka.DI.Unity.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/loggers/Akka.Logger.slf4net/Slf4NetLogger.cs b/src/contrib/loggers/Akka.Logger.slf4net/Slf4NetLogger.cs
index 3030c11facc..602cc595fe5 100644
--- a/src/contrib/loggers/Akka.Logger.slf4net/Slf4NetLogger.cs
+++ b/src/contrib/loggers/Akka.Logger.slf4net/Slf4NetLogger.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Properties/AssemblyInfo.cs b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Properties/AssemblyInfo.cs
index a1ea9b52d10..4a5a91dbbc6 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite/Properties/AssemblyInfo.cs b/src/contrib/persistence/Akka.Persistence.Sqlite/Properties/AssemblyInfo.cs
index 54e9a7dba57..7c3405e4ba2 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite/Properties/AssemblyInfo.cs
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/AkkaSerializationSpec.cs b/src/contrib/serializers/Akka.Serialization.TestKit/AkkaSerializationSpec.cs
index a3301ae24b1..9e720f39d1f 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/AkkaSerializationSpec.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/AkkaSerializationSpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/ContainerMessage.cs b/src/contrib/serializers/Akka.Serialization.TestKit/ContainerMessage.cs
index 1855604ed46..52130ad023e 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/ContainerMessage.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/ContainerMessage.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
namespace Akka.Tests.Serialization
{
public class ContainerMessage
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/EmptyActor.cs b/src/contrib/serializers/Akka.Serialization.TestKit/EmptyActor.cs
index d9b4ace3af5..61785e9128f 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/EmptyActor.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/EmptyActor.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using Akka.Actor;
namespace Akka.Tests.Serialization
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessage.cs b/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessage.cs
index 8a74f2c7e9d..289531d4be2 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessage.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessage.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System;
namespace Akka.Tests.Serialization
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessageWithPrivateCtor.cs b/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessageWithPrivateCtor.cs
index 4ffb4d2b977..344a4dd184b 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessageWithPrivateCtor.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/ImmutableMessageWithPrivateCtor.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System;
namespace Akka.Tests.Serialization
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/Properties/AssemblyInfo.cs b/src/contrib/serializers/Akka.Serialization.TestKit/Properties/AssemblyInfo.cs
index faad5f7d1ce..5da09ccb6f4 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/Properties/AssemblyInfo.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/SomeMessage.cs b/src/contrib/serializers/Akka.Serialization.TestKit/SomeMessage.cs
index e96556a55ee..3d2c101524c 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/SomeMessage.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/SomeMessage.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using Akka.Actor;
namespace Akka.Tests.Serialization
diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/UntypedContainerMessage.cs b/src/contrib/serializers/Akka.Serialization.TestKit/UntypedContainerMessage.cs
index 6e372a2a5ef..f6f9413d8d6 100644
--- a/src/contrib/serializers/Akka.Serialization.TestKit/UntypedContainerMessage.cs
+++ b/src/contrib/serializers/Akka.Serialization.TestKit/UntypedContainerMessage.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System;
namespace Akka.Tests.Serialization
diff --git a/src/contrib/serializers/Akka.Serialization.Wire/Properties/AssemblyInfo.cs b/src/contrib/serializers/Akka.Serialization.Wire/Properties/AssemblyInfo.cs
index ae9f65360b8..1e25e3dbb5c 100644
--- a/src/contrib/serializers/Akka.Serialization.Wire/Properties/AssemblyInfo.cs
+++ b/src/contrib/serializers/Akka.Serialization.Wire/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/serializers/Akka.Serialization.WireTests/Properties/AssemblyInfo.cs b/src/contrib/serializers/Akka.Serialization.WireTests/Properties/AssemblyInfo.cs
index 8248fd83ad2..24c62db5de5 100644
--- a/src/contrib/serializers/Akka.Serialization.WireTests/Properties/AssemblyInfo.cs
+++ b/src/contrib/serializers/Akka.Serialization.WireTests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/contrib/serializers/Akka.Serialization.WireTests/WireTests.cs b/src/contrib/serializers/Akka.Serialization.WireTests/WireTests.cs
index 519242f4b88..efa4e093320 100644
--- a/src/contrib/serializers/Akka.Serialization.WireTests/WireTests.cs
+++ b/src/contrib/serializers/Akka.Serialization.WireTests/WireTests.cs
@@ -1,4 +1,11 @@
-using Akka.Tests.Serialization;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Tests.Serialization;
namespace Akka.Serialization.WireTests
{
diff --git a/src/contrib/testkits/Akka.TestKit.NUnit.Tests/AssertionsTests.cs b/src/contrib/testkits/Akka.TestKit.NUnit.Tests/AssertionsTests.cs
index e9e7f5fc5f7..aaabb969a7f 100644
--- a/src/contrib/testkits/Akka.TestKit.NUnit.Tests/AssertionsTests.cs
+++ b/src/contrib/testkits/Akka.TestKit.NUnit.Tests/AssertionsTests.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/contrib/testkits/Akka.TestKit.NUnit.Tests/TestKitTestFixtureTest.cs b/src/contrib/testkits/Akka.TestKit.NUnit.Tests/TestKitTestFixtureTest.cs
index e83b1313305..59962c789dd 100644
--- a/src/contrib/testkits/Akka.TestKit.NUnit.Tests/TestKitTestFixtureTest.cs
+++ b/src/contrib/testkits/Akka.TestKit.NUnit.Tests/TestKitTestFixtureTest.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/contrib/testkits/Akka.TestKit.NUnit/NUnitAssertions.cs b/src/contrib/testkits/Akka.TestKit.NUnit/NUnitAssertions.cs
index 28ee8d86618..1b39150a30c 100644
--- a/src/contrib/testkits/Akka.TestKit.NUnit/NUnitAssertions.cs
+++ b/src/contrib/testkits/Akka.TestKit.NUnit/NUnitAssertions.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiApprover.cs b/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiApprover.cs
index cc17e6ca9de..c77405e6f9b 100644
--- a/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiApprover.cs
+++ b/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiApprover.cs
@@ -1,4 +1,11 @@
-using System.IO;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.IO;
using ApprovalTests;
using ApprovalTests.Namers;
using Mono.Cecil;
diff --git a/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiGenerator.cs b/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiGenerator.cs
index 424d5db4490..4de71e3aed3 100644
--- a/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiGenerator.cs
+++ b/src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiGenerator.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.CodeDom;
using System.CodeDom.Compiler;
using System.Collections.Generic;
diff --git a/src/core/Akka.API.Tests/CoreAPISpec.cs b/src/core/Akka.API.Tests/CoreAPISpec.cs
index 07c4d1c62e2..72056bc6df3 100644
--- a/src/core/Akka.API.Tests/CoreAPISpec.cs
+++ b/src/core/Akka.API.Tests/CoreAPISpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.API.Tests/CoreAPISpecConfig.cs b/src/core/Akka.API.Tests/CoreAPISpecConfig.cs
index ded18a34903..ec88baef260 100644
--- a/src/core/Akka.API.Tests/CoreAPISpecConfig.cs
+++ b/src/core/Akka.API.Tests/CoreAPISpecConfig.cs
@@ -1,4 +1,11 @@
-using ApprovalTests.Reporters;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using ApprovalTests.Reporters;
#if(DEBUG)
[assembly: UseReporter(typeof(DiffReporter), typeof(AllFailingTestsClipboardReporter))]
#else
diff --git a/src/core/Akka.Cluster.Tests.MultiNode/Properties/AssemblyInfo.cs b/src/core/Akka.Cluster.Tests.MultiNode/Properties/AssemblyInfo.cs
index ebe8d053261..297a2eb7d39 100644
--- a/src/core/Akka.Cluster.Tests.MultiNode/Properties/AssemblyInfo.cs
+++ b/src/core/Akka.Cluster.Tests.MultiNode/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/core/Akka.FSharp/Properties/AssemblyInfo.fs b/src/core/Akka.FSharp/Properties/AssemblyInfo.fs
index ede3203756a..633f2fa65f2 100644
--- a/src/core/Akka.FSharp/Properties/AssemblyInfo.fs
+++ b/src/core/Akka.FSharp/Properties/AssemblyInfo.fs
@@ -1,4 +1,11 @@
-namespace System
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+namespace System
open System
open System.Reflection
open System.Runtime.InteropServices
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/EnumerableExtensions.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/EnumerableExtensions.cs
index 2e0ffdcd996..5c2e1b820d3 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/EnumerableExtensions.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/EnumerableExtensions.cs
@@ -1,5 +1,6 @@
// -----------------------------------------------------------------------
//
+// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
// -----------------------------------------------------------------------
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/FileNameGenerator.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/FileNameGenerator.cs
index 2b6062cffe8..2ab6c3e784b 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/FileNameGenerator.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/FileNameGenerator.cs
@@ -1,5 +1,6 @@
// -----------------------------------------------------------------------
//
+// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
// -----------------------------------------------------------------------
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/IRetrievableTestRunStore.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/IRetrievableTestRunStore.cs
index b6844b3939d..a8d7a4b3f07 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/IRetrievableTestRunStore.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/IRetrievableTestRunStore.cs
@@ -1,5 +1,6 @@
// -----------------------------------------------------------------------
//
+// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
// -----------------------------------------------------------------------
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItem.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItem.cs
index dfa3cfe44fe..7a4e0f142eb 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItem.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItem.cs
@@ -1,8 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright (C) 2013-2015 Akka.NET project
-//
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+// -----------------------------------------------------------------------
+
using System;
namespace Akka.MultiNodeTestRunner.Shared.Persistence
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItemFactory.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItemFactory.cs
index f695aa7e3c5..f3cbe2eea92 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItemFactory.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/TimelineItemFactory.cs
@@ -1,8 +1,10 @@
+// -----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
// -----------------------------------------------------------------------
-//
-// Copyright (C) 2013-2015 Akka.NET project
-//
-// -----------------------------------------------------------------------
+
using System;
namespace Akka.MultiNodeTestRunner.Shared.Persistence
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerPersistentTestRunStore.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerPersistentTestRunStore.cs
index f4eb62fe2e6..9051626328b 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerPersistentTestRunStore.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerPersistentTestRunStore.cs
@@ -1,5 +1,6 @@
// -----------------------------------------------------------------------
//
+// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
// -----------------------------------------------------------------------
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.Tree.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.Tree.cs
index 087ff7df83c..5208bf33c7b 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.Tree.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.Tree.cs
@@ -1,8 +1,10 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
//
+// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
-//
-// -----------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------
+
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.cs
index 01eab9aa223..5d481fdc1b2 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Persistence/VisualizerRuntimeTemplate.cs
@@ -1,4 +1,11 @@
-// ------------------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+// ------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version: 12.0.0.0
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Sinks/FileSystemAppenderActor.cs b/src/core/Akka.MultiNodeTestRunner.Shared/Sinks/FileSystemAppenderActor.cs
index f711cf7bf83..b0b700dc094 100644
--- a/src/core/Akka.MultiNodeTestRunner.Shared/Sinks/FileSystemAppenderActor.cs
+++ b/src/core/Akka.MultiNodeTestRunner.Shared/Sinks/FileSystemAppenderActor.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System;
using System.IO;
using Akka.Actor;
diff --git a/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryReceiveActorSpec.cs b/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryReceiveActorSpec.cs
index e1c312830d5..374253a8f60 100644
--- a/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryReceiveActorSpec.cs
+++ b/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryReceiveActorSpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Persistence/AtLeastOnceDeliveryReceiveActor.cs b/src/core/Akka.Persistence/AtLeastOnceDeliveryReceiveActor.cs
index 3094ea9cf83..d79664df34c 100644
--- a/src/core/Akka.Persistence/AtLeastOnceDeliveryReceiveActor.cs
+++ b/src/core/Akka.Persistence/AtLeastOnceDeliveryReceiveActor.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Persistence/AtLeastOnceDeliverySemantic.cs b/src/core/Akka.Persistence/AtLeastOnceDeliverySemantic.cs
index b751c037898..13685f4fc36 100644
--- a/src/core/Akka.Persistence/AtLeastOnceDeliverySemantic.cs
+++ b/src/core/Akka.Persistence/AtLeastOnceDeliverySemantic.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Persistence/Fsm/PersistentFSM.cs b/src/core/Akka.Persistence/Fsm/PersistentFSM.cs
index 4e32617a303..c611f1ece15 100644
--- a/src/core/Akka.Persistence/Fsm/PersistentFSM.cs
+++ b/src/core/Akka.Persistence/Fsm/PersistentFSM.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Persistence/Fsm/PersistentFSMBase.cs b/src/core/Akka.Persistence/Fsm/PersistentFSMBase.cs
index fa8a2a1ac58..11265ed14fe 100644
--- a/src/core/Akka.Persistence/Fsm/PersistentFSMBase.cs
+++ b/src/core/Akka.Persistence/Fsm/PersistentFSMBase.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Remote.Tests.MultiNode/Properties/AssemblyInfo.cs b/src/core/Akka.Remote.Tests.MultiNode/Properties/AssemblyInfo.cs
index f27b1862c05..9f2132a526e 100644
--- a/src/core/Akka.Remote.Tests.MultiNode/Properties/AssemblyInfo.cs
+++ b/src/core/Akka.Remote.Tests.MultiNode/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/core/Akka.Remote.Tests.MultiNode/RemoteDeploymentDeathWatchSpec.cs b/src/core/Akka.Remote.Tests.MultiNode/RemoteDeploymentDeathWatchSpec.cs
index 139a51a4084..70b49ff4215 100644
--- a/src/core/Akka.Remote.Tests.MultiNode/RemoteDeploymentDeathWatchSpec.cs
+++ b/src/core/Akka.Remote.Tests.MultiNode/RemoteDeploymentDeathWatchSpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Remote.Tests.Performance/ForkJoinDispatcherRemoteMessagingThroughputSpec.cs b/src/core/Akka.Remote.Tests.Performance/ForkJoinDispatcherRemoteMessagingThroughputSpec.cs
index ad4f18da650..1a6bd06ef4f 100644
--- a/src/core/Akka.Remote.Tests.Performance/ForkJoinDispatcherRemoteMessagingThroughputSpec.cs
+++ b/src/core/Akka.Remote.Tests.Performance/ForkJoinDispatcherRemoteMessagingThroughputSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using Akka.Configuration;
using Akka.Remote.Tests.Performance.Transports;
diff --git a/src/core/Akka.Remote.Tests.Performance/InboundMessageDispatcherSpec.cs b/src/core/Akka.Remote.Tests.Performance/InboundMessageDispatcherSpec.cs
index aeda87da814..e1837ba3f6c 100644
--- a/src/core/Akka.Remote.Tests.Performance/InboundMessageDispatcherSpec.cs
+++ b/src/core/Akka.Remote.Tests.Performance/InboundMessageDispatcherSpec.cs
@@ -1,4 +1,11 @@
-using System.Threading;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Threading;
using Akka.Actor;
using Akka.Configuration;
using Akka.Util.Internal;
diff --git a/src/core/Akka.Remote.Tests.Performance/Properties/AssemblyInfo.cs b/src/core/Akka.Remote.Tests.Performance/Properties/AssemblyInfo.cs
index 1af1384502d..9c0b89ff364 100644
--- a/src/core/Akka.Remote.Tests.Performance/Properties/AssemblyInfo.cs
+++ b/src/core/Akka.Remote.Tests.Performance/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/core/Akka.Remote.Tests.Performance/ThreadPoolDispatcherRemoteMessagingThroughputSpec.cs b/src/core/Akka.Remote.Tests.Performance/ThreadPoolDispatcherRemoteMessagingThroughputSpec.cs
index 9c6ad0b9335..829eae2e749 100644
--- a/src/core/Akka.Remote.Tests.Performance/ThreadPoolDispatcherRemoteMessagingThroughputSpec.cs
+++ b/src/core/Akka.Remote.Tests.Performance/ThreadPoolDispatcherRemoteMessagingThroughputSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using Akka.Configuration;
using Akka.Remote.Tests.Performance.Transports;
diff --git a/src/core/Akka.Remote.Tests.Performance/Transports/AssociationStressSpecBase.cs b/src/core/Akka.Remote.Tests.Performance/Transports/AssociationStressSpecBase.cs
index 3abe8d2eb3c..50fb6f01d43 100644
--- a/src/core/Akka.Remote.Tests.Performance/Transports/AssociationStressSpecBase.cs
+++ b/src/core/Akka.Remote.Tests.Performance/Transports/AssociationStressSpecBase.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using Akka.Actor;
using Akka.Configuration;
using Akka.Remote.Transport;
diff --git a/src/core/Akka.Remote.Tests.Performance/Transports/HeliosRemoteMessagingThroughputSpec.cs b/src/core/Akka.Remote.Tests.Performance/Transports/HeliosRemoteMessagingThroughputSpec.cs
index 021ce7ecb3d..2185908df8a 100644
--- a/src/core/Akka.Remote.Tests.Performance/Transports/HeliosRemoteMessagingThroughputSpec.cs
+++ b/src/core/Akka.Remote.Tests.Performance/Transports/HeliosRemoteMessagingThroughputSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
namespace Akka.Remote.Tests.Performance.Transports
{
// todo: SKIP FOR NOW - BUGS
diff --git a/src/core/Akka.Remote.Tests.Performance/Transports/RemoteMessagingThroughputSpecBase.cs b/src/core/Akka.Remote.Tests.Performance/Transports/RemoteMessagingThroughputSpecBase.cs
index 25fd3b900d4..8133abef077 100644
--- a/src/core/Akka.Remote.Tests.Performance/Transports/RemoteMessagingThroughputSpecBase.cs
+++ b/src/core/Akka.Remote.Tests.Performance/Transports/RemoteMessagingThroughputSpecBase.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Threading;
using System.Threading.Tasks;
using Akka.Actor;
diff --git a/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportAssociationStressSpec.cs b/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportAssociationStressSpec.cs
index e0141aea027..f70a4bee11e 100644
--- a/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportAssociationStressSpec.cs
+++ b/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportAssociationStressSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System;
using Akka.Configuration;
using Akka.Remote.Transport;
diff --git a/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportRemoteMessagingThroughputSpec.cs b/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportRemoteMessagingThroughputSpec.cs
index e43620f1e9b..52eef41103d 100644
--- a/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportRemoteMessagingThroughputSpec.cs
+++ b/src/core/Akka.Remote.Tests.Performance/Transports/TestTransportRemoteMessagingThroughputSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System;
using Akka.Configuration;
using Akka.Remote.Transport;
diff --git a/src/core/Akka.Remote.Tests/RemoteConsistentHashingRouterSpec.cs b/src/core/Akka.Remote.Tests/RemoteConsistentHashingRouterSpec.cs
index 529f52b00e1..825587f2d20 100644
--- a/src/core/Akka.Remote.Tests/RemoteConsistentHashingRouterSpec.cs
+++ b/src/core/Akka.Remote.Tests/RemoteConsistentHashingRouterSpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Remote.Tests/UntrustedSpec.cs b/src/core/Akka.Remote.Tests/UntrustedSpec.cs
index 5e157715f59..6d1ac013082 100644
--- a/src/core/Akka.Remote.Tests/UntrustedSpec.cs
+++ b/src/core/Akka.Remote.Tests/UntrustedSpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Remote/RemoteSystemDaemon.cs b/src/core/Akka.Remote/RemoteSystemDaemon.cs
index f1517a810bc..f7ec322b72b 100644
--- a/src/core/Akka.Remote/RemoteSystemDaemon.cs
+++ b/src/core/Akka.Remote/RemoteSystemDaemon.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Tests.Performance/Actor/ActorMemoryFootprintSpec.cs b/src/core/Akka.Tests.Performance/Actor/ActorMemoryFootprintSpec.cs
index 8ec233ec3f6..d682eb505db 100644
--- a/src/core/Akka.Tests.Performance/Actor/ActorMemoryFootprintSpec.cs
+++ b/src/core/Akka.Tests.Performance/Actor/ActorMemoryFootprintSpec.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using Akka.Actor;
using Akka.Util.Internal;
using NBench;
diff --git a/src/core/Akka.Tests.Performance/Actor/ActorPathSpec.cs b/src/core/Akka.Tests.Performance/Actor/ActorPathSpec.cs
index d8b6f548443..2aa8534b743 100644
--- a/src/core/Akka.Tests.Performance/Actor/ActorPathSpec.cs
+++ b/src/core/Akka.Tests.Performance/Actor/ActorPathSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Actor;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Actor;
using NBench;
namespace Akka.Tests.Performance.Actor
diff --git a/src/core/Akka.Tests.Performance/Actor/ActorSelectionSpecs.cs b/src/core/Akka.Tests.Performance/Actor/ActorSelectionSpecs.cs
index bd417230b06..fb78ae48b84 100644
--- a/src/core/Akka.Tests.Performance/Actor/ActorSelectionSpecs.cs
+++ b/src/core/Akka.Tests.Performance/Actor/ActorSelectionSpecs.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Threading;
using Akka.Actor;
using Akka.Util.Internal;
diff --git a/src/core/Akka.Tests.Performance/Actor/ActorThroughputSpecBase.cs b/src/core/Akka.Tests.Performance/Actor/ActorThroughputSpecBase.cs
index ac342b200b7..925e294bbce 100644
--- a/src/core/Akka.Tests.Performance/Actor/ActorThroughputSpecBase.cs
+++ b/src/core/Akka.Tests.Performance/Actor/ActorThroughputSpecBase.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Threading;
using Akka.Actor;
using Akka.Util.Internal;
diff --git a/src/core/Akka.Tests.Performance/Actor/AddressSpec.cs b/src/core/Akka.Tests.Performance/Actor/AddressSpec.cs
index 3f89001c286..14e123e8404 100644
--- a/src/core/Akka.Tests.Performance/Actor/AddressSpec.cs
+++ b/src/core/Akka.Tests.Performance/Actor/AddressSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Actor;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Actor;
using NBench;
namespace Akka.Tests.Performance.Actor
diff --git a/src/core/Akka.Tests.Performance/Actor/MinimalActorRefThroughputSpec.cs b/src/core/Akka.Tests.Performance/Actor/MinimalActorRefThroughputSpec.cs
index 49593ac2f57..0ff70ad4114 100644
--- a/src/core/Akka.Tests.Performance/Actor/MinimalActorRefThroughputSpec.cs
+++ b/src/core/Akka.Tests.Performance/Actor/MinimalActorRefThroughputSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System.Threading;
using Akka.Actor;
using NBench;
diff --git a/src/core/Akka.Tests.Performance/Actor/ReceiveActorThroughputSpec.cs b/src/core/Akka.Tests.Performance/Actor/ReceiveActorThroughputSpec.cs
index 3dbe3c43b42..e9e3bca1958 100644
--- a/src/core/Akka.Tests.Performance/Actor/ReceiveActorThroughputSpec.cs
+++ b/src/core/Akka.Tests.Performance/Actor/ReceiveActorThroughputSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System.Threading;
using Akka.Actor;
using NBench;
diff --git a/src/core/Akka.Tests.Performance/Actor/UntypedActorThroughputSpec.cs b/src/core/Akka.Tests.Performance/Actor/UntypedActorThroughputSpec.cs
index 9f0efca9c75..a3bd857c4f8 100644
--- a/src/core/Akka.Tests.Performance/Actor/UntypedActorThroughputSpec.cs
+++ b/src/core/Akka.Tests.Performance/Actor/UntypedActorThroughputSpec.cs
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
using System.Threading;
using Akka.Actor;
using NBench;
diff --git a/src/core/Akka.Tests.Performance/Dispatch/DefaultDispatcherColdThroughputSpec.cs b/src/core/Akka.Tests.Performance/Dispatch/DefaultDispatcherColdThroughputSpec.cs
index c23f98ccbc4..db7fd098c4f 100644
--- a/src/core/Akka.Tests.Performance/Dispatch/DefaultDispatcherColdThroughputSpec.cs
+++ b/src/core/Akka.Tests.Performance/Dispatch/DefaultDispatcherColdThroughputSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Configuration;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
using Akka.Dispatch;
namespace Akka.Tests.Performance.Dispatch
diff --git a/src/core/Akka.Tests.Performance/Dispatch/DispatcherThroughputSpecBase.cs b/src/core/Akka.Tests.Performance/Dispatch/DispatcherThroughputSpecBase.cs
index af00d1b067e..ef28e673b4a 100644
--- a/src/core/Akka.Tests.Performance/Dispatch/DispatcherThroughputSpecBase.cs
+++ b/src/core/Akka.Tests.Performance/Dispatch/DispatcherThroughputSpecBase.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Threading;
using Akka.Dispatch;
using NBench;
diff --git a/src/core/Akka.Tests.Performance/Dispatch/ForkJoinDispatcherThroughputSpec.cs b/src/core/Akka.Tests.Performance/Dispatch/ForkJoinDispatcherThroughputSpec.cs
index 5e23c712abf..95cde81164a 100644
--- a/src/core/Akka.Tests.Performance/Dispatch/ForkJoinDispatcherThroughputSpec.cs
+++ b/src/core/Akka.Tests.Performance/Dispatch/ForkJoinDispatcherThroughputSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Configuration;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
using Akka.Dispatch;
namespace Akka.Tests.Performance.Dispatch
diff --git a/src/core/Akka.Tests.Performance/Dispatch/MailboxMemoryFootprintSpec.cs b/src/core/Akka.Tests.Performance/Dispatch/MailboxMemoryFootprintSpec.cs
index e2e648957ba..c7bbe2a8f03 100644
--- a/src/core/Akka.Tests.Performance/Dispatch/MailboxMemoryFootprintSpec.cs
+++ b/src/core/Akka.Tests.Performance/Dispatch/MailboxMemoryFootprintSpec.cs
@@ -1,4 +1,11 @@
-using System.Collections.Generic;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Collections.Generic;
using Akka.Dispatch;
using NBench;
diff --git a/src/core/Akka.Tests.Performance/Dispatch/ThreadPoolDispatcherThroughputSpec.cs b/src/core/Akka.Tests.Performance/Dispatch/ThreadPoolDispatcherThroughputSpec.cs
index c23f98ccbc4..842dc956542 100644
--- a/src/core/Akka.Tests.Performance/Dispatch/ThreadPoolDispatcherThroughputSpec.cs
+++ b/src/core/Akka.Tests.Performance/Dispatch/ThreadPoolDispatcherThroughputSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Configuration;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
using Akka.Dispatch;
namespace Akka.Tests.Performance.Dispatch
diff --git a/src/core/Akka.Tests.Performance/Properties/AssemblyInfo.cs b/src/core/Akka.Tests.Performance/Properties/AssemblyInfo.cs
index c807b338893..169579711e3 100644
--- a/src/core/Akka.Tests.Performance/Properties/AssemblyInfo.cs
+++ b/src/core/Akka.Tests.Performance/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/core/Akka.Tests/Actor/ActorCellSpec.cs b/src/core/Akka.Tests/Actor/ActorCellSpec.cs
index d4c872e8f8c..b49b5cdb318 100644
--- a/src/core/Akka.Tests/Actor/ActorCellSpec.cs
+++ b/src/core/Akka.Tests/Actor/ActorCellSpec.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
diff --git a/src/core/Akka.Tests/Actor/AskTimeoutSpec.cs b/src/core/Akka.Tests/Actor/AskTimeoutSpec.cs
index 0a65bee89b6..2f31324918e 100644
--- a/src/core/Akka.Tests/Actor/AskTimeoutSpec.cs
+++ b/src/core/Akka.Tests/Actor/AskTimeoutSpec.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Cancellation_Tests.cs b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Cancellation_Tests.cs
index 9279b5cdf37..50a550b7610 100644
--- a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Cancellation_Tests.cs
+++ b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Cancellation_Tests.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Schedule_Tests.cs b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Schedule_Tests.cs
index e9f13542635..6c59f73f36d 100644
--- a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Schedule_Tests.cs
+++ b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_ActionScheduler_Schedule_Tests.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Cancellation_Tests.cs b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Cancellation_Tests.cs
index 088ce04ce3c..7db519951ef 100644
--- a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Cancellation_Tests.cs
+++ b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Cancellation_Tests.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Schedule_Tests.cs b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Schedule_Tests.cs
index 7557b832a80..97747c90a47 100644
--- a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Schedule_Tests.cs
+++ b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_TellScheduler_Schedule_Tests.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_Verify_TimeProvider.cs b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_Verify_TimeProvider.cs
index ac32acd12d5..3fb81a35f52 100644
--- a/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_Verify_TimeProvider.cs
+++ b/src/core/Akka.Tests/Actor/Scheduler/TaskBasedScheduler_Verify_TimeProvider.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka/Event/EventBusUnsubscriber.cs b/src/core/Akka/Event/EventBusUnsubscriber.cs
index 67ed2d212ed..cc1a1b166c1 100644
--- a/src/core/Akka/Event/EventBusUnsubscriber.cs
+++ b/src/core/Akka/Event/EventBusUnsubscriber.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/core/Akka/Serialization/JavaSerializer.cs b/src/core/Akka/Serialization/JavaSerializer.cs
index bb8aaec5a46..8ef085c35ee 100644
--- a/src/core/Akka/Serialization/JavaSerializer.cs
+++ b/src/core/Akka/Serialization/JavaSerializer.cs
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------
-//
+//
// Copyright (C) 2009-2015 Typesafe Inc.
// Copyright (C) 2013-2015 Akka.NET project
//
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/AutomaticCluster.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/AutomaticCluster.cs
index 4b4b87c4f42..fb5c9049ec0 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/AutomaticCluster.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/AutomaticCluster.cs
@@ -1,4 +1,11 @@
-using System.Collections.Immutable;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Collections.Immutable;
using System.Data.SQLite;
using System.Linq;
using Akka.Actor;
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/DBHelper.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/DBHelper.cs
index c74d45443a2..33dc8873391 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/DBHelper.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/AutomaticJoin/DBHelper.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs
index 20f0c6c033b..8f5b9c51a99 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs
@@ -1,4 +1,11 @@
-using Akka.Cluster.Sharding;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Cluster.Sharding;
namespace ClusterSharding.Node
{
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs
index 8126d08e282..1e61564d084 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using Akka.Actor;
using Akka.Cluster.Sharding;
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs
index 86b79d39113..62c4934f95e 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Linq;
using System.Threading;
using Akka.Actor;
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Properties/AssemblyInfo.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Properties/AssemblyInfo.cs
index 6353e6f1ad0..d1903197006 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Properties/AssemblyInfo.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Program.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Program.cs
index 5276e28829c..c9df49dc851 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Program.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Program.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using Akka.Actor;
using Akka.Cluster.Tools.Client;
using Akka.Cluster.Tools.Singleton;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Properties/AssemblyInfo.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Properties/AssemblyInfo.cs
index 6aa6d925bbe..35edce22476 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Properties/AssemblyInfo.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs
index 2cb8ab1c7e6..47fad55402e 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using Akka.Actor;
using Akka.Cluster.Tools.Client;
using Akka.Cluster.Tools.PublishSubscribe;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Properties/AssemblyInfo.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Properties/AssemblyInfo.cs
index 31a74ff3380..55f18ee3c08 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Properties/AssemblyInfo.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs
index 6c3fff9ce6e..42abb432e7a 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using Akka.Actor;
using Akka.Cluster;
using Akka.Cluster.Tools.PublishSubscribe;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Messages.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Messages.cs
index e7dc3c1361b..1cd803ffc04 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Messages.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Messages.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using System.Collections.Generic;
using Akka.Actor;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Properties/AssemblyInfo.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Properties/AssemblyInfo.cs
index 8eade652224..6c93d640ebe 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Properties/AssemblyInfo.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkLoadCounter.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkLoadCounter.cs
index 8272942c51d..156934a11d1 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkLoadCounter.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkLoadCounter.cs
@@ -1,4 +1,11 @@
-using System.Collections.Generic;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System.Collections.Generic;
using Akka.Actor;
using Akka.Event;
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Worker.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Worker.cs
index 9fe7e2454e3..67ca81c4ec6 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Worker.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Worker.cs
@@ -1,4 +1,11 @@
-using Akka.Actor;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using Akka.Actor;
using Akka.Event;
namespace ClusterToolsExample.Shared
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkerManager.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkerManager.cs
index 516bfc797ae..e088e7b87df 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkerManager.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/WorkerManager.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+//
+// Copyright (C) 2009-2015 Typesafe Inc.
+// Copyright (C) 2013-2015 Akka.NET project
+//
+//-----------------------------------------------------------------------
+
+using System;
using Akka.Actor;
using Akka.Cluster.Routing;
using Akka.Event;
diff --git a/tools/CheckSourceFilesForIncorrectHeader.ps1 b/tools/CheckSourceFilesForIncorrectHeader.ps1
new file mode 100644
index 00000000000..e189a471687
--- /dev/null
+++ b/tools/CheckSourceFilesForIncorrectHeader.ps1
@@ -0,0 +1,9 @@
+$copyright_pattern = "copyright"
+
+Write-Host "The following C# files do not have a copyright notice:`n"
+gci -Path ..\src -Recurse|? {$_.FullName -notlike "*bin*" -and $_.FullName -notlike "*obj*" -and $_.Name -match "\.cs$"}|% {if (-not (gc $_.FullName | select-string -SimpleMatch $_.Name)){$_}}|select -ExpandProperty FullName
+
+Write-Host "`n`n"
+
+Write-Host "The following F# files do not have a copyright notice:`n"
+gci -Path ..\src -Recurse|? {$_.FullName -notlike "*bin*" -and $_.FullName -notlike "*obj*" -and $_.Name -match "\.fs$"}|% {if (-not (gc $_.FullName | select-string -SimpleMatch $_.Name)){$_}}|select -ExpandProperty FullName
\ No newline at end of file