diff --git a/.travis.yml b/.travis.yml
index 55c59c71a257b7b59759ae9041bbc4c877748c46..9ced84b874a22405221e430914c80033b1b7b3af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
-notifications:
-  slack: erlang-ninja:UfDJWnBzKhPRCAKeqC8xdi4A
-
 language: erlang
 otp_release:
-   - R16B
-   - R15B03
+  - 17.5
+  - R16B
+  - R15B03
+
+notifications:
+  slack: erlang-ninja:UfDJWnBzKhPRCAKeqC8xdi4A
diff --git a/README.md b/README.md
index cdc72ab0d7461dc44c96a00c041c89b0d04920ef..4d6adc415df1d5dcfbd36d5d190cde42830e0461 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[![Stories in Ready](https://badge.waffle.io/ErlangNinja/gurka.png?label=ready)](https://waffle.io/ehedenst/gurka)
+[![Stories in Ready](https://badge.waffle.io/ErlangNinja/gurka.png?label=ready)](https://waffle.io/ErlangNinja/gurka)
 
-[![Build Status](https://travis-ci.org/ErlangNinja/gurka.png?branch=develop)](https://travis-ci.org/ehedenst/gurka)
+[![Build Status](https://travis-ci.org/ErlangNinja/gurka.png?branch=develop)](https://travis-ci.org/ErlangNinja/gurka)
 
 gurka
 =====
diff --git a/test/feature_parser.erl b/test/feature_parser.erl
index 457735d1ceaeb57fe9d8adbfc3e7b1912ad7f846..86a7e961451acf36fa48e96600463ee562c35646 100644
--- a/test/feature_parser.erl
+++ b/test/feature_parser.erl
@@ -40,7 +40,7 @@ given(Tokens, State) ->
     {ok, State}.
 
 then("the parsed result should have $StepCount $StepType steps", State) ->
-    ExpectedCount = binary_to_integer(StepCount),
+    ExpectedCount = list_to_integer(binary_to_list(StepCount)),
     Type = binary_to_atom(StepType, utf8),
     RealCount = lists:foldl(
         fun({_, Action, _, _}, Sum) when Action == Type -> Sum + 1;