diff --git a/LicenceHeader/Program.cs b/LicenceHeader/Program.cs
index 254d29d2455f2a17d3e974d4c1ca862dc7476668..a4d66a6b51b445ac47e6406f1f488834ed636fbe 100644
--- a/LicenceHeader/Program.cs
+++ b/LicenceHeader/Program.cs
@@ -45,10 +45,10 @@ namespace LicenceHeader
 
 		private static void Main()
 		{
-			var licence = File.ReadAllText("header.txt", Encoding.Default);
+			var licence = File.ReadAllText("header.txt", Encoding.UTF8);
 			var count = 0;
 
-			foreach (var file in Directory.GetFiles(SolutionRootDirectory, "*.cs", SearchOption.AllDirectories)) {
+			foreach (var file in Directory.EnumerateFiles(SolutionRootDirectory, "*.cs", SearchOption.AllDirectories)) {
 				Console.WriteLine(file);
 				if (file.Contains("\\obj\\") || file.Contains("\\bin\\")) {
 					continue;
diff --git a/LicenceHeader/header.txt b/LicenceHeader/header.txt
index 35ed3e452c6fae85fae39b6f87d5babcc8a6990c..ae62a01598b3a8a32e3809375079f169bf66ac83 100644
--- a/LicenceHeader/header.txt
+++ b/LicenceHeader/header.txt
@@ -1,7 +1,7 @@
 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2016 European Union
+* Copyright © 2012-2016 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
diff --git a/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs b/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs
index 21ae7e4449848044dd19e6b0da5902082edbeb08..8b14eeaeac2762a69ab5ce2c0d6762ba0f460dd7 100644
--- a/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs
@@ -1,3 +1,34 @@
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
 using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.Models.Connector.Ports;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
diff --git a/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index 824624da341fe1c9e5a8e2481eb82885363d81d7..dfdc92d990a8ca26d3c949b3551e0f6daeefa2df 100644
--- a/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -1,3 +1,34 @@
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
 using System.Diagnostics;
 using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.Exceptions;
diff --git a/VectoCore/Utils/SearchAlgorithm.cs b/VectoCore/Utils/SearchAlgorithm.cs
index a10d4affcc2764f27054fc39410e7c836a45b163..548eb4fd1cb7d2fe4a268abe52812ce3c7d5ac16 100644
--- a/VectoCore/Utils/SearchAlgorithm.cs
+++ b/VectoCore/Utils/SearchAlgorithm.cs
@@ -1,4 +1,35 @@
-using System;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+using System;
 using System.Collections.Generic;
 using NLog;
 using TUGraz.VectoCore.Exceptions;