diff --git a/.travis.yml b/.travis.yml
index 0b810563d..5d2da251c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,9 @@ branches:
   only:
     - master
     - develop
+env:
+ - OPTIONS="-DCMAKE_BUILD_TYPE=Release"
+ - OPTIONS="-DCMAKE_BUILD_TYPE=Debug"
 notifications:
  irc:
   channels:
diff --git a/features/bicycle/roundabout.feature b/features/bicycle/roundabout.feature
new file mode 100644
index 000000000..3a725a0a8
--- /dev/null
+++ b/features/bicycle/roundabout.feature
@@ -0,0 +1,30 @@
+@routing @bicycle @roundabout @instruction
+Feature: Roundabout Instructions
+	
+	Background:
+		Given the profile "bicycle"
+	
+	Scenario: Bicycle - Roundabout instructions
+		Given the node map
+		 |   |   | v |   |   |
+		 |   |   | d |   |   |
+		 | s | a |   | c | u |
+		 |   |   | b |   |   |
+		 |   |   | t |   |   |
+
+		And the ways
+		 | nodes | junction   |
+		 | sa    |            |
+		 | tb    |            |
+		 | uc    |            |
+		 | vd    |            |
+		 | abcda | roundabout |
+ 
+		When I route I should get
+		 | from | to | route | turns                               |
+		 | s    | t  | sa,tb | head,enter_roundabout-1,destination |
+		 | s    | u  | sa,uc | head,enter_roundabout-2,destination |
+		 | s    | v  | sa,vd | head,enter_roundabout-3,destination |
+		 | u    | v  | uc,vd | head,enter_roundabout-1,destination |
+		 | u    | s  | uc,sa | head,enter_roundabout-2,destination |
+		 | u    | t  | uc,tb | head,enter_roundabout-3,destination |
diff --git a/features/car/roundabout.feature b/features/car/roundabout.feature
new file mode 100644
index 000000000..caaf686c9
--- /dev/null
+++ b/features/car/roundabout.feature
@@ -0,0 +1,30 @@
+@routing @car @roundabout @instruction
+Feature: Roundabout Instructions
+	
+	Background:
+		Given the profile "car"
+	
+	Scenario: Car - Roundabout instructions
+		Given the node map
+		 |   |   | v |   |   |
+		 |   |   | d |   |   |
+		 | s | a |   | c | u |
+		 |   |   | b |   |   |
+		 |   |   | t |   |   |
+
+		And the ways
+		 | nodes | junction   |
+		 | sa    |            |
+		 | tb    |            |
+		 | uc    |            |
+		 | vd    |            |
+		 | abcda | roundabout |
+ 
+		When I route I should get
+		 | from | to | route | turns                               |
+		 | s    | t  | sa,tb | head,enter_roundabout-1,destination |
+		 | s    | u  | sa,uc | head,enter_roundabout-2,destination |
+		 | s    | v  | sa,vd | head,enter_roundabout-3,destination |
+		 | u    | v  | uc,vd | head,enter_roundabout-1,destination |
+		 | u    | s  | uc,sa | head,enter_roundabout-2,destination |
+		 | u    | t  | uc,tb | head,enter_roundabout-3,destination |
diff --git a/features/support/route.rb b/features/support/route.rb
index 9cfbbfa14..804782135 100644
--- a/features/support/route.rb
+++ b/features/support/route.rb
@@ -122,9 +122,13 @@ def turn_list instructions
     16 => :enter_contraflow,
     17 => :leave_contraflow
   }
-  instructions.
-  map { |r| types[r[0].to_i].to_s }.
-  join(',')
+  # replace instructions codes with strings
+  # "11-3" (enter roundabout and leave a 3rd exit) gets converted to "enter_roundabout-3"
+  instructions.map do |r|
+    r[0].to_s.gsub!(/^\d*/) do |match|
+      types[match.to_i].to_s
+    end
+  end.join(',')    
 end
 
 def mode_list instructions