diff --git a/acat2/src/acat.cpp b/acat2/src/acat.cpp
index 56b838b21c428d07734fdd44fc40adc87ca4d0b9..2001a754e11b55cda32665d544a11e53ee4dfbc9 100644
--- a/acat2/src/acat.cpp
+++ b/acat2/src/acat.cpp
@@ -5,7 +5,6 @@
  *      Author: Martin Zak
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 #include <string>
 #include <exception/AlibException.h>
diff --git a/aconversions2/src/aconversion.cpp b/aconversions2/src/aconversion.cpp
index 9cea6f7055e78df19b6a73a274c40ee397d61ed0..8c1f7fc7fd24d8e4d0ec0e36fab9262804a3493d 100644
--- a/aconversions2/src/aconversion.cpp
+++ b/aconversions2/src/aconversion.cpp
@@ -1,8 +1,8 @@
 /*
- * aconversion
- *
- * Usage: aconversion [-V] -t target [-a algorithm] < input.xml
+ * aconversion.cpp
  *
+ *  Created on: 26. 3. 2014
+ *	  Author: Tomas Pecka
  */
 
 #include <iostream>
diff --git a/aconvert2/src/aconvert.cpp b/aconvert2/src/aconvert.cpp
index b5072739b99ec0ad7169c1fb1d71651175a828cb..8e0a96a3154642a99347f6ece738b79edb82ecab 100644
--- a/aconvert2/src/aconvert.cpp
+++ b/aconvert2/src/aconvert.cpp
@@ -1,3 +1,10 @@
+/*
+ * aconvert.cpp
+ *
+ *  Created on: 26. 3. 2014
+ *	  Author: Martin Zak
+ */
+
 #include <iostream>
 #include <fstream>
 #include "automaton/FSM/FiniteAutomatonFromStringParser.h"
diff --git a/aderivation2/src/aderivation.cpp b/aderivation2/src/aderivation.cpp
index 6770a8202b53f0c98ae8cb9b7a35089c8c66a7c1..bd08316c486a00befec86724f9f45f03b66bfc61 100644
--- a/aderivation2/src/aderivation.cpp
+++ b/aderivation2/src/aderivation.cpp
@@ -5,7 +5,6 @@
  *      Author: Tomas Pecka
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 
 #include <factory/DataFactory.hpp>
diff --git a/adeterminize2/src/adeterminize.cpp b/adeterminize2/src/adeterminize.cpp
index 8b37b6a25af7d0bdbad5c21abd0b6d46ca6f1bce..2e48421f86f51a2ba1c5f67e81ef3d4dda0bd97e 100644
--- a/adeterminize2/src/adeterminize.cpp
+++ b/adeterminize2/src/adeterminize.cpp
@@ -1,3 +1,10 @@
+/*
+ * adeterminize.cpp
+ *
+ *  Created on: 26. 3. 2014
+ *	  Author: Tomas Pecka
+ */
+
 #include <iostream>
 #include <getopt.h>
 #include <string.h>
diff --git a/adiff2/src/adiff.cpp b/adiff2/src/adiff.cpp
index e32a7c2c38474bdd9a3ff4070fa3a870e897cf16..39920e0962d3603889e50494498566b55bc93406 100644
--- a/adiff2/src/adiff.cpp
+++ b/adiff2/src/adiff.cpp
@@ -5,7 +5,6 @@
  *      Author: Jan Travnicek
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 
 #include "factory/DataFactory.hpp"
diff --git a/aepsilon2/src/aepsilon.cpp b/aepsilon2/src/aepsilon.cpp
index b4fc1ff14fa66a9072503697e69a0d96813b2b72..9498a4f31ca71150682d39158b1bb490b2f42b22 100644
--- a/aepsilon2/src/aepsilon.cpp
+++ b/aepsilon2/src/aepsilon.cpp
@@ -5,7 +5,6 @@
  *      Author: Jan Travnicek
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 
 #include <factory/DataFactory.hpp>
diff --git a/aintegral2/src/aintegral.cpp b/aintegral2/src/aintegral.cpp
index d7098448dc2371ba110bfbd6ed0ce5f4952d278e..2af07d69b8db819e8b4814331435ce308cdc8642 100644
--- a/aintegral2/src/aintegral.cpp
+++ b/aintegral2/src/aintegral.cpp
@@ -5,7 +5,6 @@
  *      Author: Tomas Pecka
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 
 #include <factory/DataFactory.hpp>
diff --git a/aminimize2/src/aminimize.cpp b/aminimize2/src/aminimize.cpp
index 329d29a9ee99aae481986efff50b7df4b0cb8c76..cba10710ad47853907e8e3f6f142857ef9f13f36 100644
--- a/aminimize2/src/aminimize.cpp
+++ b/aminimize2/src/aminimize.cpp
@@ -5,7 +5,6 @@
  *      Author: Jan Travnicek
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 
 #include <exception/AlibException.h>
diff --git a/anormalize2/src/anormalize.cpp b/anormalize2/src/anormalize.cpp
index 9a1ea4382e5307b9468eb98393a5218df9b7078b..e5bfc4b5ba4a2a17eba86f6d00d0ef5a4499f299 100644
--- a/anormalize2/src/anormalize.cpp
+++ b/anormalize2/src/anormalize.cpp
@@ -5,7 +5,6 @@
  *      Author: Jan Travnicek
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 
 #include "exception/AlibException.h"
diff --git a/arename2/src/arename.cpp b/arename2/src/arename.cpp
index 39b6f34acc4e344e5b139d97ecb8e4726aeabfc5..fc81b088cb4740e06692429d49d7d7a7aa2687dd 100644
--- a/arename2/src/arename.cpp
+++ b/arename2/src/arename.cpp
@@ -5,7 +5,6 @@
  *      Author: Jan Travnicek
  */
 
-#include <iostream>
 #include <tclap/CmdLine.h>
 
 #include "exception/AlibException.h"
diff --git a/arun2/src/arun.cpp b/arun2/src/arun.cpp
index 76d412735200c7f78ad8198d943adf2f4d052185..20660413f8a9299b3f20c45bd28b44a0fcabb496 100644
--- a/arun2/src/arun.cpp
+++ b/arun2/src/arun.cpp
@@ -1,3 +1,10 @@
+/*
+ * arun.cpp
+ *
+ *  Created on: 26. 3. 2014
+ *	  Author: Jan Travnicek
+ */
+
 #include <tclap/CmdLine.h>
 #include <vector>
 
diff --git a/astat2/src/Settings.h b/astat2/src/Settings.h
index 00b9c97f374356cf4b90b5d945449d18ebc463c8..7fa6f9c792b4a4b8f7b4f4fb92a2a8b0336c5963 100644
--- a/astat2/src/Settings.h
+++ b/astat2/src/Settings.h
@@ -1,3 +1,10 @@
+/*
+ * Settings.h
+ *
+ *  Created on: 26. 3. 2014
+ *	  Author: Jan Travnicek
+ */
+
 #ifndef __SETTINGS_H__
 #define __SETTINGS_H__
 
diff --git a/astat2/src/astat.cpp b/astat2/src/astat.cpp
index 8fb37c0d12a5f10ca407e1db889b2f465431677c..e9973ffc02c170f75b49e41ca106b5103c00a68c 100644
--- a/astat2/src/astat.cpp
+++ b/astat2/src/astat.cpp
@@ -1,3 +1,10 @@
+/*
+ * astat.cpp
+ *
+ *  Created on: 26. 3. 2014
+ *	  Author: Jan Travnicek
+ */
+
 #include <tclap/CmdLine.h>
 #include <vector>
 
diff --git a/astringology2/src/astringology.cpp b/astringology2/src/astringology.cpp
index 03de19343ebd6a7963140cf8d3bc14cf51705437..4f1a2ce66cea301e86ee15a5c1dc9de48fba6872 100644
--- a/astringology2/src/astringology.cpp
+++ b/astringology2/src/astringology.cpp
@@ -1,3 +1,10 @@
+/*
+ * astringology.cpp
+ *
+ *  Created on: 26. 3. 2014
+ *	  Author: Jan Travnicek
+ */
+
 #include <tclap/CmdLine.h>
 #include <vector>
 
diff --git a/atrim2/src/atrim.cpp b/atrim2/src/atrim.cpp
index 5c4c11f8a360c8a955476ccbc77c6b03446b965f..75125213472453dadf3db17e2e97fdd5c09b749c 100644
--- a/atrim2/src/atrim.cpp
+++ b/atrim2/src/atrim.cpp
@@ -1,3 +1,10 @@
+/*
+ * atrim.cpp
+ *
+ *  Created on: 26. 3. 2014
+ *	  Author: Tomas Pecka
+ */
+
 #include <iostream>
 #include <getopt.h>