diff --git a/alib2str/src/automaton/AutomatonFromStringLexer.cpp b/alib2str/src/automaton/AutomatonFromStringLexer.cpp
index e5db4fedd24e9e96d9fdf90af0b0f61fff947830..75d2d9fc74117c12461544f424eee354e21a0d01 100644
--- a/alib2str/src/automaton/AutomatonFromStringLexer.cpp
+++ b/alib2str/src/automaton/AutomatonFromStringLexer.cpp
@@ -12,8 +12,8 @@ AutomatonFromStringLexer::Token AutomatonFromStringLexer::next(ext::istream& inp
 	char character;
 
 L0:
-	character = input.get();
-	if ( input.eof ( ) || character == EOF ) { // for some reason the input stream was not setting eof bit for automata input without last newline
+	character = static_cast < char > ( input.get ( ) );
+	if ( input.eof ( ) ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if(character == '\r' || character == '\n') {
@@ -109,8 +109,9 @@ L0:
 		token.type = TokenType::ERROR;
 		return token;
 	}
+
 L1:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		token.type = TokenType::TEOF;
 		return token;
@@ -129,7 +130,7 @@ L1:
 	}
 
 L2:
-	character = input.get ( );
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) ) {
 		return token;
 	} else if ( ( character >= '0' ) && ( character <= '9' ) ) {
diff --git a/alib2str/src/container/ContainerFromStringLexer.cpp b/alib2str/src/container/ContainerFromStringLexer.cpp
index 31abfa4da2b118ec7a32a5fd889b8bc76ea6f2ef..c0bd6314f0cdc59768c9fe0fa528245614ab6dc3 100644
--- a/alib2str/src/container/ContainerFromStringLexer.cpp
+++ b/alib2str/src/container/ContainerFromStringLexer.cpp
@@ -10,7 +10,7 @@ ContainerFromStringLexer::Token ContainerFromStringLexer::next(ext::istream& inp
 	char character;
 
 L0:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
diff --git a/alib2str/src/grammar/GrammarFromStringLexer.cpp b/alib2str/src/grammar/GrammarFromStringLexer.cpp
index 7695d3364e1d216137d7f66be90bc86a0750b5e2..435ad618bede377cf71b7319c5bc2c901831f75e 100644
--- a/alib2str/src/grammar/GrammarFromStringLexer.cpp
+++ b/alib2str/src/grammar/GrammarFromStringLexer.cpp
@@ -10,8 +10,8 @@ GrammarFromStringLexer::Token GrammarFromStringLexer::next(ext::istream& input)
 	char character;
 
 L0:
-	character = input.get();
-	if ( input.eof ( ) || character == EOF ) {
+	character = static_cast < char > ( input.get ( ) );
+	if ( input.eof ( ) ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if ( ext::isspace ( character ) ) {
@@ -126,8 +126,9 @@ L0:
 		token.raw = "";
 		return token;
 	}
+
 L1:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		token.type = TokenType::TEOF;
 		return token;
@@ -144,8 +145,9 @@ L1:
 		token.type = TokenType::ERROR;
 		return token;
 	}
+
 L2:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		token.type = TokenType::TEOF;
 		return token;
diff --git a/alib2str/src/primitive/PrimitiveFromStringLexer.cpp b/alib2str/src/primitive/PrimitiveFromStringLexer.cpp
index ce1c01b7dcc21096242d975deef1d8a95568cad2..1c01090f4ca3f910e483e404bd4b789302d02baa 100644
--- a/alib2str/src/primitive/PrimitiveFromStringLexer.cpp
+++ b/alib2str/src/primitive/PrimitiveFromStringLexer.cpp
@@ -10,8 +10,8 @@ PrimitiveFromStringLexer::Token PrimitiveFromStringLexer::next(ext::istream& inp
 	char character;
 
 L0:
-	character = input.get();
-	if ( input.eof ( ) || character == EOF ) {
+	character = static_cast < char > ( input.get ( ) );
+	if ( input.eof ( ) ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if ( ext::isspace ( character ) ) {
@@ -36,7 +36,7 @@ L0:
 		return token;
 	}
 L1:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		return token;
 	} else if ( ( character >= 'a' && character <= 'z' ) || ( character >= 'A' && character <= 'Z' ) || character == '_' || ( character >= '0' && character <= '9' ) ) {
@@ -49,7 +49,7 @@ L1:
 		return token;
 	}
 L2:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		return token;
 	} else if(character >= '0' && character <= '9') {
diff --git a/alib2str/src/regexp/RegExpFromStringLexer.cpp b/alib2str/src/regexp/RegExpFromStringLexer.cpp
index ecea220328b2a721e7c75a638eecda98be0780c9..5c23f8b046519dd3b9ccb7c2bf66352e76e1c8f1 100644
--- a/alib2str/src/regexp/RegExpFromStringLexer.cpp
+++ b/alib2str/src/regexp/RegExpFromStringLexer.cpp
@@ -10,8 +10,8 @@ RegExpFromStringLexer::Token RegExpFromStringLexer::next(ext::istream& input) {
 	char character;
 
 L0:
-	character = input.get();
-	if ( input.eof ( ) || character == EOF ) {
+	character = static_cast < char > ( input.get ( ) );
+	if ( input.eof ( ) ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if ( ext::isspace ( character ) ) {
@@ -49,8 +49,9 @@ L0:
 		token.type = TokenType::ERROR;
 		return token;
 	}
+
 L1:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		token.type = TokenType::TEOF;
 		return token;
diff --git a/alib2str/src/rte/RTEFromStringLexer.cpp b/alib2str/src/rte/RTEFromStringLexer.cpp
index a08811b192928b5269f4aeca03cb5208e1506021..d0f79c67ca3babd0c92eef3f159cc6dd65241d8d 100644
--- a/alib2str/src/rte/RTEFromStringLexer.cpp
+++ b/alib2str/src/rte/RTEFromStringLexer.cpp
@@ -10,8 +10,8 @@ RTEFromStringLexer::Token RTEFromStringLexer::next(ext::istream& input) {
 	char character;
 
 L0:
-	character = input.get();
-	if ( input.eof ( ) || character == EOF ) {
+	character = static_cast < char > ( input.get ( ) );
+	if ( input.eof ( ) ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if ( ext::isspace ( character ) ) {
@@ -64,8 +64,9 @@ L0:
 		token.type = TokenType::ERROR;
 		return token;
 	}
+
 L1:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		token.type = TokenType::TEOF;
 		return token;
@@ -82,8 +83,9 @@ L1:
 		token.type = TokenType::ERROR;
 		return token;
 	}
-L2:	character = input.get ( );
 
+L2:
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) ) {
 		return token;
 	} else if ( ( character >= '0' ) && ( character <= '9' ) ) {
diff --git a/alib2str/src/string/StringFromStringLexer.cpp b/alib2str/src/string/StringFromStringLexer.cpp
index 9f9a2f25ac89380b3545874e002fd974b108a385..2824364efe9e7705167189bdbce19dcd0eeba87b 100644
--- a/alib2str/src/string/StringFromStringLexer.cpp
+++ b/alib2str/src/string/StringFromStringLexer.cpp
@@ -10,7 +10,7 @@ StringFromStringLexer::Token StringFromStringLexer::next(ext::istream& input) {
 	char character;
 
 L0:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
@@ -44,8 +44,9 @@ L0:
 		token.type = TokenType::ERROR;
 		return token;
 	}
+
 L1:
-	character = input.get();
+	character = static_cast < char > ( input.get ( ) );
 	if(input.eof()) {
 		token.type = TokenType::TEOF;
 		return token;
diff --git a/alib2str/src/tree/TreeFromStringLexer.cpp b/alib2str/src/tree/TreeFromStringLexer.cpp
index f57d936f4ce7c9bcf3bcc0f1218dc7b838966070..8f5259dda0504b0f3a1a156537426e19e9ae58ad 100644
--- a/alib2str/src/tree/TreeFromStringLexer.cpp
+++ b/alib2str/src/tree/TreeFromStringLexer.cpp
@@ -11,7 +11,7 @@ TreeFromStringLexer::Token TreeFromStringLexer::next ( ext::istream & input ) {
 	char character;
 
 L0:
-	character = input.get ( );
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
@@ -83,8 +83,8 @@ L0:
 		return token;
 	}
 
-L1:	character = input.get ( );
-
+L1:
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) ) {
 		token.type = TokenType::TEOF;
 		return token;
@@ -112,8 +112,8 @@ L1:	character = input.get ( );
 		return token;
 	}
 
-L2:	character = input.get ( );
-
+L2:
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) ) {
 		return token;
 	} else if ( ( character >= '0' ) && ( character <= '9' ) ) {
@@ -126,8 +126,8 @@ L2:	character = input.get ( );
 		return token;
 	}
 
-L3:	character = input.get ( );
-
+L3:
+	character = static_cast < char > ( input.get ( ) );
 	if ( input.eof ( ) ) {
 		token.type = TokenType::TEOF;
 		return token;
diff --git a/examples2/automaton/DFA_no_new_line.txt b/examples2/automaton/DFA_no_new_line.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b92752c85a7a86876af988d10fbac92ddb7e1a4c
--- /dev/null
+++ b/examples2/automaton/DFA_no_new_line.txt
@@ -0,0 +1,19 @@
+DFA a b c d
+0 1 - - -
+1 14 - - -
+10 - 2 - -
+11 - 8 - -
+12 - 7 - -
+13 - 16 - -
+14 - - 5 12
+15 - - - 13
+<16 - - - -
+<17 4 - - -
+2 15 - - -
+>3 10 9 0 12
+<4 - 11 - -
+<5 - 6 5 -
+<6 - - 5 -
+<7 - - - 12
+8 10 17 0 12
+9 4 - - -
\ No newline at end of file