diff --git a/alib2data/src/FromXMLParser.cpp b/alib2data/src/FromXMLParser.cpp
index 1eafd5d8c4b4981aa7a1095d6370f0482c4d72f4..7997a1bdaa6f754da0aaf0a91707dc3a53b00ecc 100644
--- a/alib2data/src/FromXMLParser.cpp
+++ b/alib2data/src/FromXMLParser.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "FromXMLParser.hpp"
-#include "FromXMLParsers.h"
+#include "FromXMLParsers.hpp"
 
 namespace alib {
 
diff --git a/alib2data/src/FromXMLParsers.cpp b/alib2data/src/FromXMLParsers.cpp
index a2c88853208090957ce5d126e8e45b30f5ddd2fb..68ff419390ea75f42efa08070dee0bd11e805dc5 100644
--- a/alib2data/src/FromXMLParsers.cpp
+++ b/alib2data/src/FromXMLParsers.cpp
@@ -5,7 +5,7 @@
  * Author: Jan Travnicek
  */
 
-#include "FromXMLParsers.h"
+#include "FromXMLParsers.hpp"
 
 namespace alib {
 
@@ -16,5 +16,10 @@ const string::StringFromXMLParser FromXMLParsers::stringParser;
 const automaton::AutomatonFromXMLParser FromXMLParsers::automatonParser;
 const grammar::GrammarFromXMLParser FromXMLParsers::grammarParser;
 const exception::ExceptionFromXMLParser FromXMLParsers::exceptionParser;
+const container::ContainerFromXMLParser FromXMLParsers::containerParser;
+
+automaton::DFA api<automaton::DFA>::parse(std::list<sax::Token>& input) {
+	return FromXMLParsers::automatonParser.parseDFA(input);
+}
 
 } /* namespace alib */
diff --git a/alib2data/src/FromXMLParsers.h b/alib2data/src/FromXMLParsers.hpp
similarity index 58%
rename from alib2data/src/FromXMLParsers.h
rename to alib2data/src/FromXMLParsers.hpp
index 7ee07c91c86c7ce4b474e7f0362c1567af5a643a..120d1c5337a0ba2ecc63a99f74bf489c9a390fba 100644
--- a/alib2data/src/FromXMLParsers.h
+++ b/alib2data/src/FromXMLParsers.hpp
@@ -1,12 +1,12 @@
 /*
- * FromXMLParsers.h
+ * FromXMLParsers.hpp
  *
  * Created on: Apr 1, 2013
  * Author: Jan Travnicek
  */
 
-#ifndef FROM_XML_PARSERS_H_
-#define FROM_XML_PARSERS_H_
+#ifndef FROM_XML_PARSERS_HPP_
+#define FROM_XML_PARSERS_HPP_
 
 #include "label/LabelFromXMLParser.h"
 #include "alphabet/SymbolFromXMLParser.h"
@@ -18,6 +18,27 @@
 
 namespace alib {
 
+template<typename T>
+struct api {
+	static T parse(std::list<sax::Token>& input);
+};
+
+template<typename T>
+struct api<std::set<T>> {
+	static std::set<T> parse(std::list<sax::Token>& input);
+};
+
+template<>
+struct api<automaton::DFA> {
+	static automaton::DFA parse(std::list<sax::Token>& input);
+};
+
+}
+
+#include "container/ContainerFromXMLParser.h"
+
+namespace alib {
+
 /**
  * Basic exception from which are derived all other exceptions.
  * Contains reason why the exception occured.
@@ -31,9 +52,15 @@ public:
 	static const automaton::AutomatonFromXMLParser automatonParser;
 	static const grammar::GrammarFromXMLParser grammarParser;
 	static const exception::ExceptionFromXMLParser exceptionParser;
+	static const container::ContainerFromXMLParser containerParser;
 
 };
 
+template<typename T>
+std::set<T> api<std::set<T>>::parse(std::list<sax::Token>& input) {
+	return FromXMLParsers::containerParser.parseSet<T>(input);
+}
+
 } /* namespace alib */
 
-#endif /* FROM_XML_PARSERS_H_ */
+#endif /* FROM_XML_PARSERS_HPP_ */
diff --git a/alib2data/src/alphabet/SymbolFromStringLexer.cpp b/alib2data/src/alphabet/SymbolFromStringLexer.cpp
index 75e228ded487e86d400edc153a8b875246639482..0e0ce6626ebb03ce23fe816ecbc7d0be54be9359 100644
--- a/alib2data/src/alphabet/SymbolFromStringLexer.cpp
+++ b/alib2data/src/alphabet/SymbolFromStringLexer.cpp
@@ -1,3 +1,10 @@
+/*
+ * SymbolFromStringLexer.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "SymbolFromStringLexer.h"
 #include "../label/LabelFromStringLexer.h"
 
diff --git a/alib2data/src/alphabet/SymbolFromStringLexer.h b/alib2data/src/alphabet/SymbolFromStringLexer.h
index d5d572c2cd816bfbcd88871ddb6bb9443eb16c00..354611946c187feac194ba12bd532d2de2371d24 100644
--- a/alib2data/src/alphabet/SymbolFromStringLexer.h
+++ b/alib2data/src/alphabet/SymbolFromStringLexer.h
@@ -1,3 +1,10 @@
+/*
+ * SymbolFromStringLexer.h
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #ifndef SYMBOL_FROM_STRING_LEXER_H_
 #define SYMBOL_FROM_STRING_LEXER_H_
 
diff --git a/alib2data/src/alphabet/SymbolFromStringParser.cpp b/alib2data/src/alphabet/SymbolFromStringParser.cpp
index 83b11f71659f9d5063a95f59ed8c816b6ce1dfa5..36c1b733fdce549723e1d05c1d18aed9fb303522 100644
--- a/alib2data/src/alphabet/SymbolFromStringParser.cpp
+++ b/alib2data/src/alphabet/SymbolFromStringParser.cpp
@@ -1,3 +1,10 @@
+/*
+ * SymbolFromStringParser.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "SymbolFromStringParser.h"
 #include "../exception/AlibException.h"
 #include "BlankSymbol.h"
diff --git a/alib2data/src/alphabet/SymbolFromXMLParser.cpp b/alib2data/src/alphabet/SymbolFromXMLParser.cpp
index fd42a9b2d4bcf937a415f0b08917dd528553adb6..d132f82cbcd96d5bfaaefd16986274f69c8f6162 100644
--- a/alib2data/src/alphabet/SymbolFromXMLParser.cpp
+++ b/alib2data/src/alphabet/SymbolFromXMLParser.cpp
@@ -10,7 +10,7 @@
 #include "../sax/ParserException.h"
 #include "../label/Label.h"
 
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 
 namespace alphabet {
 
diff --git a/alib2data/src/automaton/AutomatonFromXMLParser.cpp b/alib2data/src/automaton/AutomatonFromXMLParser.cpp
index 1733f7e7220940fde3f748a81e1a92a7a15e80cf..abf8ae579575f1ce233af560635f01bf6772f8c1 100644
--- a/alib2data/src/automaton/AutomatonFromXMLParser.cpp
+++ b/alib2data/src/automaton/AutomatonFromXMLParser.cpp
@@ -13,7 +13,7 @@
 #include "../label/Label.h"
 #include "../alphabet/LabeledSymbol.h"
 
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 
 namespace automaton {
 
diff --git a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.cpp b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.cpp
index c27375864473b11f18b26b5e03558ea74dabeb96..44a6a118665d9affda521161b1a89729ee73adb6 100644
--- a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.cpp
+++ b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.cpp
@@ -1,3 +1,10 @@
+/*
+ * FiniteAutomatonFromStringLexer.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "FiniteAutomatonFromStringLexer.h"
 
 namespace automaton {
diff --git a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.h b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.h
index 1683ee5c15d00424c778e7f8f2e0f6ef3a713b86..f96c7fd07c7f4e5509e2926f4e47e69d4e804b66 100644
--- a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.h
+++ b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringLexer.h
@@ -1,3 +1,10 @@
+/*
+ * FiniteAutomatonFromStringLexer.h
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #ifndef FINITE_AUTOMATON_FROM_STRING_LEXER_H_
 #define FINITE_AUTOMATON_FROM_STRING_LEXER_H_
 
diff --git a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.cpp b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.cpp
index d3b7ea50f12a5b404593a31922c92a58c109c77f..2d40eaac7c8de3ced8ec61c9ae58f7a4ad4c5140 100644
--- a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.cpp
+++ b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.cpp
@@ -1,3 +1,10 @@
+/*
+ * FiniteAutomatonFromStringParser.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "FiniteAutomatonFromStringParser.h"
 
 #include "../../exception/AlibException.h"
diff --git a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.h b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.h
index 5cb570200521d1cdcddfaf449e9dccb142dfbcf7..e48865f4554b8c21431f44ad5695841402ae3884 100644
--- a/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.h
+++ b/alib2data/src/automaton/FSM/FiniteAutomatonFromStringParser.h
@@ -1,3 +1,10 @@
+/*
+ * FiniteAutomatonFromStringParser.h
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #ifndef FINITE_AUTOMATON_FROM_STRING_PARSER_H_
 #define FINITE_AUTOMATON_FROM_STRING_PARSER_H_
 
diff --git a/alib2data/src/container/ContainerFromXMLParser.cpp b/alib2data/src/container/ContainerFromXMLParser.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5d188c437cd944b921d60a384d848866b929d368
--- /dev/null
+++ b/alib2data/src/container/ContainerFromXMLParser.cpp
@@ -0,0 +1,21 @@
+/*
+ * ContainerFromXMLParser.cpp
+ *
+ *  Created on: Oct 12, 2013
+ *      Author: Jan Travnicek
+ */
+
+#include "ContainerFromXMLParser.h"
+
+namespace container {
+
+bool ContainerFromXMLParser::first(std::list<sax::Token>& input) const {
+	if(isToken(input, sax::Token::TokenType::START_ELEMENT, "set")) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+} /* namespace automaton */
+
diff --git a/alib2data/src/container/ContainerFromXMLParser.h b/alib2data/src/container/ContainerFromXMLParser.h
new file mode 100644
index 0000000000000000000000000000000000000000..24d06345b7de6fe43b9571dd61575842ea4b64db
--- /dev/null
+++ b/alib2data/src/container/ContainerFromXMLParser.h
@@ -0,0 +1,52 @@
+/*
+ * ContainerFromXMLParser.h
+ *
+ *  Created on: Oct 12, 2013
+ *      Author: Jan Travnicek
+ */
+
+#ifndef CONTAINER_FROM_XML_PARSER_H_
+#define CONTAINER_FROM_XML_PARSER_H_
+
+#include "../sax/FromXMLParserHelper.h"
+#include "../FromXMLParser.hpp"
+
+#include <set>
+
+namespace container {
+
+/**
+ * Parser used to get general FSM or EpsilonNFA, NFA, DFA from XML parsed into list of Tokens.
+ */
+class ContainerFromXMLParser : public sax::FromXMLParserHelper {
+public:
+	bool first(std::list<sax::Token>& input) const;
+
+	template<typename T>
+	std::set<T> parseSet(std::list<sax::Token>& input) const;
+};
+
+}
+
+#include "../FromXMLParsers.hpp"
+
+namespace container {
+
+template<typename T>
+std::set<T> ContainerFromXMLParser::parseSet(std::list<sax::Token>& input) const {
+	popToken(input, sax::Token::TokenType::START_ELEMENT, "set");
+
+	std::set<T> set;
+
+	while(isTokenType(input, sax::Token::TokenType::START_ELEMENT)) {
+		set.insert(alib::api<T>::parse(input));
+	}
+
+	popToken(input, sax::Token::TokenType::END_ELEMENT, "set");
+	return set;
+}
+
+} /* namespace container */
+
+#endif /* CONTAINER_FROM_XML_PARSER_H_ */
+
diff --git a/alib2data/src/factory/AutomatonFactory.cpp b/alib2data/src/factory/AutomatonFactory.cpp
index 725900046ae3258809d80cfdfd78b2cd30f7ffea..530190925e9f7abf3965a6f5785f07b758239282 100644
--- a/alib2data/src/factory/AutomatonFactory.cpp
+++ b/alib2data/src/factory/AutomatonFactory.cpp
@@ -9,7 +9,7 @@
 
 #include "../sax/SaxParseInterface.h"
 #include "../sax/SaxComposeInterface.h"
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 #include "../ToXMLComposers.h"
 
 namespace automaton {
diff --git a/alib2data/src/factory/ExceptionFactory.cpp b/alib2data/src/factory/ExceptionFactory.cpp
index c72f09762bac187e679534bc9fc07371f59fb06b..ae3ac3db1450deef2eeb49b9069022f228744beb 100644
--- a/alib2data/src/factory/ExceptionFactory.cpp
+++ b/alib2data/src/factory/ExceptionFactory.cpp
@@ -9,7 +9,7 @@
 
 #include "../sax/SaxParseInterface.h"
 #include "../sax/SaxComposeInterface.h"
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 #include "../ToXMLComposers.h"
 
 namespace exception {
diff --git a/alib2data/src/factory/GrammarFactory.cpp b/alib2data/src/factory/GrammarFactory.cpp
index ee75ddfc76057338223ad3ab9814868f73b73e92..ce48b14b209b23723e4d534ec14494ef149dfb5f 100644
--- a/alib2data/src/factory/GrammarFactory.cpp
+++ b/alib2data/src/factory/GrammarFactory.cpp
@@ -9,7 +9,7 @@
 
 #include "../sax/SaxParseInterface.h"
 #include "../sax/SaxComposeInterface.h"
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 #include "../ToXMLComposers.h"
 
 namespace grammar {
diff --git a/alib2data/src/factory/LabelFactory.cpp b/alib2data/src/factory/LabelFactory.cpp
index 3ba4f012c181772ef96aaf044ec0679c30a85ca9..3fc7d6f0d6d7299e93df0dc759f7153a21956925 100644
--- a/alib2data/src/factory/LabelFactory.cpp
+++ b/alib2data/src/factory/LabelFactory.cpp
@@ -9,7 +9,7 @@
 
 #include "../sax/SaxParseInterface.h"
 #include "../sax/SaxComposeInterface.h"
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 #include "../ToXMLComposers.h"
 
 namespace label {
diff --git a/alib2data/src/factory/RegExpFactory.cpp b/alib2data/src/factory/RegExpFactory.cpp
index f47d09f0b7dce4aeeb6f86d177dc789ea33dcf65..a0b685c640d802c193a94d9027d2b462fff374bd 100644
--- a/alib2data/src/factory/RegExpFactory.cpp
+++ b/alib2data/src/factory/RegExpFactory.cpp
@@ -9,7 +9,7 @@
 
 #include "../sax/SaxParseInterface.h"
 #include "../sax/SaxComposeInterface.h"
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 #include "../ToXMLComposers.h"
 
 namespace regexp {
diff --git a/alib2data/src/factory/StringFactory.cpp b/alib2data/src/factory/StringFactory.cpp
index 97fdc3949d9c31e8b63d892c81921f3edec9f1d4..800d56a656710f8d058acfc652276b904bff73f6 100644
--- a/alib2data/src/factory/StringFactory.cpp
+++ b/alib2data/src/factory/StringFactory.cpp
@@ -9,7 +9,7 @@
 
 #include "../sax/SaxParseInterface.h"
 #include "../sax/SaxComposeInterface.h"
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 #include "../ToXMLComposers.h"
 
 namespace string {
diff --git a/alib2data/src/factory/SymbolFactory.cpp b/alib2data/src/factory/SymbolFactory.cpp
index ddfe3732b93ad7328cef5b59a35bfbe8e3472fdf..42076528ccd2a901da27cc3b3de7bc1e726ff167 100644
--- a/alib2data/src/factory/SymbolFactory.cpp
+++ b/alib2data/src/factory/SymbolFactory.cpp
@@ -9,7 +9,7 @@
 
 #include "../sax/SaxParseInterface.h"
 #include "../sax/SaxComposeInterface.h"
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 #include "../ToXMLComposers.h"
 
 namespace alphabet {
diff --git a/alib2data/src/grammar/GrammarFromXMLParser.cpp b/alib2data/src/grammar/GrammarFromXMLParser.cpp
index 547cd3d624612034ae96998ab2b1ebdfcc21c2e1..60f3c66e34c88d37de034db2e658446b20a3fc60 100644
--- a/alib2data/src/grammar/GrammarFromXMLParser.cpp
+++ b/alib2data/src/grammar/GrammarFromXMLParser.cpp
@@ -10,7 +10,7 @@
 #include "../sax/ParserException.h"
 #include "../alphabet/LabeledSymbol.h"
 
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 
 namespace grammar {
 
diff --git a/alib2data/src/label/LabelFromStringLexer.cpp b/alib2data/src/label/LabelFromStringLexer.cpp
index d7e87c2b6fc29a0b888a68875680753914b2ff7b..e053157bdfec55da3b4d7a2cf895546967c01bb4 100644
--- a/alib2data/src/label/LabelFromStringLexer.cpp
+++ b/alib2data/src/label/LabelFromStringLexer.cpp
@@ -1,3 +1,10 @@
+/*
+ * LabelFromStringLexer.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "LabelFromStringLexer.h"
 
 namespace label {
diff --git a/alib2data/src/label/LabelFromStringLexer.h b/alib2data/src/label/LabelFromStringLexer.h
index 82956cc025fb44d67a0015bccbaf3a0b09d31113..bd816cc2b85bf9f15688ce7f27fe085922fc17eb 100644
--- a/alib2data/src/label/LabelFromStringLexer.h
+++ b/alib2data/src/label/LabelFromStringLexer.h
@@ -1,3 +1,10 @@
+/*
+ * LabelFromStringLexer.h
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #ifndef LABEL_FROM_STRING_LEXER_H_
 #define LABEL_FROM_STRING_LEXER_H_
 
diff --git a/alib2data/src/label/LabelFromStringParser.cpp b/alib2data/src/label/LabelFromStringParser.cpp
index 9eead1afd879c2cd6a4470bd838a9c2a808cba7f..d2ff97db7cd140612fbf91d33ab4f647f67f8ae1 100644
--- a/alib2data/src/label/LabelFromStringParser.cpp
+++ b/alib2data/src/label/LabelFromStringParser.cpp
@@ -1,3 +1,10 @@
+/*
+ * LabelFromStringParser.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "LabelFromStringParser.h"
 #include "../exception/AlibException.h"
 #include "StringLabel.h"
diff --git a/alib2data/src/regexp/RegExpFromStringLexer.cpp b/alib2data/src/regexp/RegExpFromStringLexer.cpp
index edb6b431c4f1e88e3e50d3c87256ecb4661f0be3..d81587737bb6b760c2ca8b1d3336fea1a533fccb 100644
--- a/alib2data/src/regexp/RegExpFromStringLexer.cpp
+++ b/alib2data/src/regexp/RegExpFromStringLexer.cpp
@@ -1,3 +1,10 @@
+/*
+ * RegExpFromStringLexer.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "RegExpFromStringLexer.h"
 
 namespace regexp {
diff --git a/alib2data/src/regexp/RegExpFromStringLexer.h b/alib2data/src/regexp/RegExpFromStringLexer.h
index 411f95ac8c604c342121828110b707ad01211f64..b2d14f1b39747ebea5b95a4485f93a931357b542 100644
--- a/alib2data/src/regexp/RegExpFromStringLexer.h
+++ b/alib2data/src/regexp/RegExpFromStringLexer.h
@@ -1,3 +1,10 @@
+/*
+ * RegExpFromStringLexer.h
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #ifndef REG_EXP_FROM_STRING_LEXER_H_
 #define REG_EXP_FROM_STRING_LEXER_H_
 
diff --git a/alib2data/src/regexp/RegExpFromStringParser.cpp b/alib2data/src/regexp/RegExpFromStringParser.cpp
index ddf3bab87b1ebe1480da7886559a9e9786a50385..4a553e9313d349e715bb12d959f0e8abf645f9da 100644
--- a/alib2data/src/regexp/RegExpFromStringParser.cpp
+++ b/alib2data/src/regexp/RegExpFromStringParser.cpp
@@ -1,3 +1,10 @@
+/*
+ * RegExpFromStringParser.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "RegExpFromStringParser.h"
 #include "../sax/ParserException.h"
 #include "../exception/AlibException.h"
diff --git a/alib2data/src/regexp/RegExpFromXMLParser.cpp b/alib2data/src/regexp/RegExpFromXMLParser.cpp
index cfb06411321af4b69ce03e3ffc241888ba3971df..ba81c4e38a10a1d147c7824239d10ab5def787e1 100644
--- a/alib2data/src/regexp/RegExpFromXMLParser.cpp
+++ b/alib2data/src/regexp/RegExpFromXMLParser.cpp
@@ -9,7 +9,7 @@
 #include "../sax/ParserException.h"
 #include "../label/StringLabel.h"
 
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 
 namespace regexp {
 
diff --git a/alib2data/src/string/StringFromStringLexer.cpp b/alib2data/src/string/StringFromStringLexer.cpp
index 0d20e3673cf50c1637ab90d0ed7f5c45c845985a..6cc91cda1523f2dc70e8f29f86d78cc3390b8d7a 100644
--- a/alib2data/src/string/StringFromStringLexer.cpp
+++ b/alib2data/src/string/StringFromStringLexer.cpp
@@ -1,3 +1,10 @@
+/*
+ * StringFromStringLexer.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "StringFromStringLexer.h"
 
 namespace string {
diff --git a/alib2data/src/string/StringFromStringLexer.h b/alib2data/src/string/StringFromStringLexer.h
index ef501e38bde693d152f23ffe5d835d717dfd7b4c..a3973e4fd42da0fafc0adac84d7084577ad09555 100644
--- a/alib2data/src/string/StringFromStringLexer.h
+++ b/alib2data/src/string/StringFromStringLexer.h
@@ -1,3 +1,10 @@
+/*
+ * StringFromStringLexer.h
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #ifndef STRING_FROM_STRING_LEXER_H_
 #define STRING_FROM_STRING_LEXER_H_
 
diff --git a/alib2data/src/string/StringFromStringParser.cpp b/alib2data/src/string/StringFromStringParser.cpp
index 5906a3608ffa438998a867b3af46904eacdd4c19..208e7f3a47cdad151f8d12387f2ac2b31dd862b2 100644
--- a/alib2data/src/string/StringFromStringParser.cpp
+++ b/alib2data/src/string/StringFromStringParser.cpp
@@ -1,3 +1,10 @@
+/*
+ * StringFromStringParser.cpp
+ *
+ *  Created on: Nov 23, 2013
+ *      Author: Jan Travnicek
+ */
+
 #include "StringFromStringParser.h"
 #include "../exception/AlibException.h"
 #include "Epsilon.h"
diff --git a/alib2data/src/string/StringFromXMLParser.cpp b/alib2data/src/string/StringFromXMLParser.cpp
index 529c4e37b200ae5eb2f95f240884f2296162a3c2..7ecbcb6eef01f7f5bace053b09a08579727d12bf 100644
--- a/alib2data/src/string/StringFromXMLParser.cpp
+++ b/alib2data/src/string/StringFromXMLParser.cpp
@@ -11,7 +11,7 @@
 #include "LinearString.h"
 #include "CyclicString.h"
 
-#include "../FromXMLParsers.h"
+#include "../FromXMLParsers.hpp"
 
 namespace string {