diff --git a/OsmAnd/res/menu/map_menu.xml b/OsmAnd/res/menu/map_menu.xml
index 93b81e92de..bc10f6b8ee 100644
--- a/OsmAnd/res/menu/map_menu.xml
+++ b/OsmAnd/res/menu/map_menu.xml
@@ -6,8 +6,9 @@
 <item android:id="@+id/map_navigate_to_point" android:title="@string/stop_navigation" android:visible="false" android:icon="@android:drawable/ic_menu_close_clear_cancel"></item>
 <item android:id="@+id/map_mute" android:title="@string/menu_mute_off" android:visible="false"></item>
 <item android:id="@+id/map_get_directions" android:title="@string/get_directions" android:icon="@android:drawable/ic_menu_directions"></item>
-<item android:id="@+id/map_transport" android:title="@string/transport"></item>
 <item android:id="@+id/map_show_settings" android:title="@string/settings_Button" android:icon="@android:drawable/ic_menu_preferences"></item>
+<item android:id="@+id/map_transport" android:title="@string/transport"></item>
+
 <item android:title="@string/map_specify_point" android:id="@+id/map_specify_point" android:icon="@android:drawable/ic_menu_search"></item>
 <item android:title="@string/show_gps_status" android:id="@+id/map_show_gps_status" android:icon="@android:drawable/ic_menu_compass"></item> 
 </group>
diff --git a/OsmAnd/src/com/osmand/activities/VoiceRouter.java b/OsmAnd/src/com/osmand/activities/VoiceRouter.java
index 0813878421..f35736b831 100644
--- a/OsmAnd/src/com/osmand/activities/VoiceRouter.java
+++ b/OsmAnd/src/com/osmand/activities/VoiceRouter.java
@@ -116,7 +116,7 @@ public class VoiceRouter {
 				if(tParam != null){
 					play.turn(tParam);
 				} else if(next.turnType.isRoundAbout()){
-					play.roundAbout(next.turnType.getExitOut());
+					play.roundAbout(next.turnType.getTurnAngle(), next.turnType.getExitOut());
 				} else if(next.turnType.getValue().equals(TurnType.TU)){
 					play.makeUT();
 				} else if(next.turnType.getValue().equals(TurnType.C)){
@@ -131,7 +131,7 @@ public class VoiceRouter {
 					if (t2Param != null) {
 						play.then().turn(t2Param, next.distance);
 					} else if (nextNext.turnType.isRoundAbout()) {
-						play.then().roundAbout(next.distance, next.turnType.getExitOut());
+						play.then().roundAbout(next.distance, next.turnType.getTurnAngle(), next.turnType.getExitOut());
 					} else if (nextNext.turnType.getValue().equals(TurnType.TU)) {
 						play.then().makeUT(next.distance);
 					}
diff --git a/OsmAnd/src/com/osmand/voice/CommandPlayer.java b/OsmAnd/src/com/osmand/voice/CommandPlayer.java
index b8c8a46a83..5fdc872c6b 100644
--- a/OsmAnd/src/com/osmand/voice/CommandPlayer.java
+++ b/OsmAnd/src/com/osmand/voice/CommandPlayer.java
@@ -382,12 +382,12 @@ public class CommandPlayer {
 			return addCommand(С_PREPARE_ROUNDABOUT, dist);
 		}
 		
-		public CommandBuilder roundAbout(double dist, int exit){
-			return addCommand(С_ROUNDABOUT, dist, exit);
+		public CommandBuilder roundAbout(double dist, double angle, int exit){
+			return addCommand(С_ROUNDABOUT, dist, angle, exit);
 		}
 		
-		public CommandBuilder roundAbout(int exit){
-			return addCommand(С_ROUNDABOUT, exit);
+		public CommandBuilder roundAbout(double angle, int exit){
+			return addCommand(С_ROUNDABOUT, angle, exit);
 		}
 		
 		public CommandBuilder andArriveAtDestination(){
diff --git a/OsmAnd/voice/en/_config.p b/OsmAnd/voice/en/_config.p
new file mode 100644
index 0000000000..38e6448fe8
--- /dev/null
+++ b/OsmAnd/voice/en/_config.p
@@ -0,0 +1,123 @@
+:- op('==', xfy, 500).
+version(0).
+
+
+% before each announcement (beep)
+preamble - [].
+
+
+%% TURNS 
+turn('left', ['turn.ogg', 'left-e.ogg']).
+turn('left_sh', ['sharp_left-e.ogg']).
+turn('left_sl', ['turn.ogg', 'left-e.ogg']).
+turn('right', ['turn.ogg', 'right-e.ogg']).
+turn('right_sh', ['sharp_right-e.ogg']).
+turn('right_sl', ['turn.ogg', 'right-e.ogg']).
+
+prepare_turn(Turn, Dist) == ['Prepare_to-a.ogg', 'after-m.ogg', delay_450, D, delay_450, M] :- 
+			distance(Dist) == D, turn(Turn, M).
+turn(Turn, Dist) == ['after-m.ogg', delay_450, D, delay_450, M] :- 
+			distance(Dist) == D, turn(Turn, M).
+turn(Turn) == M :- turn(Turn, M).
+
+
+prepare_make_ut(Dist) == ['Prepare_to-a.ogg', 'after-m.ogg', delay_300, D, delay_300,'turn_back-e.ogg'] :- 
+		distance(Dist) == D.
+
+prepare_roundabout(Dist) == ['prepare_to-enter.ogg', 'after-m.ogg', delay_300, D] :- 
+		distance(Dist) == D.
+
+make_ut(Dist) == ['after-m.ogg', delay_300, D, delay_300, 'turn_back-e.ogg'] :- 
+			distance(Dist) == D.
+make_ut == ['turn_back-e.ogg'].
+
+roundabout(Dist, _Angle, Exit) == ['after-m.ogg', delay_300, D, delay_300, 'enter_the_roundabout-e.ogg', delay_250, 'and_take.ogg', 
+		delay_250, E, 'exit-e.ogg'] :- distance(Dist) == D, nth(Exit, E).
+roundabout(_Angle, Exit) == ['taking.ogg', delay_250,  E, 'exit-e.ogg'] :- nth(Exit, E).
+
+and_arrive_destination == ['arrive_at_your_destination-e.ogg']. % Miss and?
+then == ['then.ogg', delay_350].
+reached_destination == ['you_have_reached_your_destination.ogg'].
+bear_right == ['keep_right-e.ogg'].
+bear_left == ['keep_left-e.ogg'].
+route_recalc(_Dist) == []. % nothing to said possibly beep?	
+
+go_ahead(Dist) == ['drive_for-h.ogg', delay_250,  D]:- distance(Dist) == D.
+go_ahead == ['continue_straight-e.ogg'].
+
+%% 
+nth(1, '1st.ogg').
+nth(2, '2nd.ogg').
+nth(3, '3rd.ogg').
+nth(4, '4th.ogg').
+nth(5, '5th.ogg').
+nth(6, '6th.ogg').
+nth(7, '7th.ogg').
+nth(8, '8th.ogg').
+nth(9, '9th.ogg').
+nth(10, '10th.ogg').
+nth(11, '11th.ogg').
+nth(12, '12th.ogg').
+nth(13, '13th.ogg').
+nth(14, '14th.ogg').
+nth(15, '15th.ogg').
+nth(16, '16th.ogg').
+nth(17, '17th.ogg').
+
+
+%%% distance measure
+distance(Dist) == T :- Dist < 1000, dist(Dist, F), append(F, 'meters-e.ogg',T).
+dist(D, ['10.ogg']) :-  D < 20, !.
+dist(D, ['20.ogg']) :-  D < 30, !.
+dist(D, ['30.ogg']) :-  D < 40, !.
+dist(D, ['40.ogg']) :-  D < 50, !.
+dist(D, ['50.ogg']) :-  D < 60, !.
+dist(D, ['60.ogg']) :-  D < 70, !.
+dist(D, ['70.ogg']) :-  D < 80, !.
+dist(D, ['80.ogg']) :-  D < 90, !.
+dist(D, ['90.ogg']) :-  D < 100, !.
+dist(D, ['100.ogg']) :-  D < 150, !.
+dist(D, ['100_and.ogg', '50.ogg']) :-  D < 200, !.
+dist(D, ['200.ogg']) :-  D < 250, !.
+dist(D, ['200_and.ogg', '50.ogg']) :-  D < 300, !.
+dist(D, ['300.ogg']) :-  D < 350, !.
+dist(D, ['300_and.ogg', '50.ogg']) :-  D < 400, !.
+dist(D, ['400.ogg']) :-  D < 450, !.
+dist(D, ['400_and.ogg', '50.ogg']) :-  D < 500, !.
+dist(D, ['500.ogg']) :-  D < 550, !.
+dist(D, ['500_and.ogg', '50.ogg']) :-  D < 600, !.
+dist(D, ['600.ogg']) :-  D < 650, !.
+dist(D, ['600_and.ogg', '50.ogg']) :-  D < 700, !.
+dist(D, ['700.ogg']) :-  D < 750, !.
+dist(D, ['700_and.ogg', '50.ogg']) :-  D < 800, !.
+dist(D, ['800.ogg']) :-  D < 850, !.
+dist(D, ['800_and.ogg', '50.ogg']) :-  D < 900, !.
+dist(D, ['900.ogg']) :-  D < 950, !.
+dist(D, ['900_and.ogg', '50.ogg']) :-  !.
+
+
+distance(Dist) == ['more_than.ogg', '1.ogg', 'kilometer-e.ogg'] :- Dist < 1500.
+distance(Dist) == ['more_than.ogg', '2.ogg', 'kilometers-e.ogg'] :- Dist < 3000.
+distance(Dist) == ['more_than.ogg', '3.ogg', 'kilometers-e.ogg'] :- Dist < 4000.
+distance(Dist) == ['more_than.ogg', '4.ogg', 'kilometers-e.ogg'] :- Dist < 5000.
+distance(Dist) == ['more_than.ogg', '5.ogg', 'kilometers-e.ogg'] :- Dist < 6000.
+distance(Dist) == ['more_than.ogg', '6.ogg', 'kilometers-e.ogg'] :- Dist < 7000.
+distance(Dist) == ['more_than.ogg', '7.ogg', 'kilometers-e.ogg'] :- Dist < 8000.
+distance(Dist) == ['more_than.ogg', '8.ogg', 'kilometers-e.ogg'] :- Dist < 9000.
+distance(Dist) == ['more_than.ogg', '9.ogg', 'kilometers-e.ogg'] :- Dist < 10000.
+distance(Dist) == ['more_than.ogg', X, 'kilometers-e.ogg'] :- D is Dist/1000, dist(D, X).
+
+
+
+%% resolve command main method
+%% if you are familar with Prolog you can input specific to the whole mechanism,
+%% by adding exception cases.
+flatten(X, Y) :- flatten(X, [], Y), !.
+flatten([], Acc, Acc).
+flatten([X|Y], Acc, Res):- 
+		flatten(Y, Acc, R), flatten(X, R, Res).
+flatten(X, Acc, [X|Acc]).
+
+resolve(X, Y) :- resolve_impl(X,Z), flatten(Z, Y).
+resolve_impl([],[]).
+resolve_impl([X|Rest], List) :- resolve_impl(Rest, Tail), ((X == L) -> append(L, Tail, List); List = Tail).
\ No newline at end of file
diff --git a/OsmAnd/voice/_config.p b/OsmAnd/voice/ru/_config.p
similarity index 92%
rename from OsmAnd/voice/_config.p
rename to OsmAnd/voice/ru/_config.p
index 809ebf7ecf..3922cc605c 100644
--- a/OsmAnd/voice/_config.p
+++ b/OsmAnd/voice/ru/_config.p
@@ -31,9 +31,9 @@ make_ut(Dist) == ['in.ogg', delay_300, D, delay_300, 'Turn_back.ogg'] :-
 			distance(Dist) == D.
 make_ut == ['Turn_back.ogg'].
 
-roundabout(Dist, Exit) == ['in.ogg', delay_300, D, delay_300, 'roundabout.ogg', delay_250, 'DO.ogg', delay_250, E, 'the_exit.ogg'] :- 
+roundabout(Dist, _Angle, Exit) == ['in.ogg', delay_300, D, delay_300, 'roundabout.ogg', delay_250, 'DO.ogg', delay_250, E, 'the_exit.ogg'] :- 
 			distance(Dist) == D, nth(Exit, E).
-roundabout(Exit) == ['DO.ogg', delay_250,  E, 'the_exit.ogg'] :- nth(Exit, E).
+roundabout(_Angle, Exit) == ['DO.ogg', delay_250,  E, 'the_exit.ogg'] :- nth(Exit, E).
 
 and_arrive_destination == ['arrive_at_destination.ogg'].
 then == ['then.ogg', delay_350].
diff --git a/OsmAnd/voice/ru_2/_config.p b/OsmAnd/voice/ru_2/_config.p
new file mode 100644
index 0000000000..314b280d69
--- /dev/null
+++ b/OsmAnd/voice/ru_2/_config.p
@@ -0,0 +1,123 @@
+:- op('==', xfy, 500).
+version(0).
+
+
+% before each announcement (beep)
+preamble - [].
+
+
+%% TURNS 
+turn('left', ['turn_left-e.ogg']).
+turn('left_sh', ['turn_sharp_left-e.ogg']).
+turn('left_sl', ['turn_slightly_left.ogg']).
+turn('right', ['turn_right-e.ogg']).
+turn('right_sh', ['turn_sharp_right-e.ogg']).
+turn('right_sl', ['turn_slightly_right-e.ogg']).
+
+prepare_turn(Turn, Dist) == ['Prepare_to.ogg', 'after-m.ogg', delay_450, D, delay_450, M] :- 
+			distance(Dist) == D, turn(Turn, M).
+turn(Turn, Dist) == ['after-m.ogg', delay_450, D, delay_450, M] :- 
+			distance(Dist) == D, turn(Turn, M).
+turn(Turn) == M :- turn(Turn, M).
+
+
+prepare_make_ut(Dist) == ['Prepare_to.ogg', 'after-m.ogg', delay_300, D, delay_300,'turn_back-e.ogg'] :- 
+		distance(Dist) == D.
+
+prepare_roundabout(Dist) == ['Prepare_to.ogg', 'after-m.ogg', delay_300, D, delay_300, 'cross_the_roundabout-e.ogg'] :- 
+		distance(Dist) == D.
+
+make_ut(Dist) == ['after-m.ogg', delay_300, D, delay_300, 'turn_back-e.ogg'] :- 
+			distance(Dist) == D.
+make_ut == ['turn_back-e.ogg'].
+
+roundabout(Dist, _Angle, Exit) == ['after-m.ogg', delay_300, D, delay_300, 'enter_the_roundabout-e.ogg', delay_250, 'after-m.ogg', 
+		delay_250, E, 'exit-e.ogg'] :- distance(Dist) == D, nth(Exit, E).
+roundabout(_Angle, Exit) == ['taking_the.ogg', delay_250,  E, 'exit-e.ogg'] :- nth(Exit, E).
+
+and_arrive_destination == ['arrive_at_your_destination-e.ogg']. % Miss and?
+then == ['then.ogg', delay_350].
+reached_destination == ['you_have_reached_your_destination.ogg'].
+bear_right == ['keep_right-e.ogg'].
+bear_left == ['keep_left-e.ogg'].
+route_recalc(_Dist) == []. % nothing to said possibly beep?	
+
+go_ahead(Dist) == ['Drive-n.ogg', delay_250,  D]:- distance(Dist) == D.
+go_ahead == ['continue_straight-e.ogg'].
+
+%% 
+nth(1, '1st.ogg').
+nth(2, '2nd.ogg').
+nth(3, '3rd.ogg').
+nth(4, '4th.ogg').
+nth(5, '5th.ogg').
+nth(6, '6th.ogg').
+nth(7, '7th.ogg').
+nth(8, '8th.ogg').
+nth(9, '9th.ogg').
+nth(10, '10th.ogg').
+nth(11, '11th.ogg').
+nth(12, '12th.ogg').
+nth(13, '13th.ogg').
+nth(14, '14th.ogg').
+nth(15, '15th.ogg').
+nth(16, '16th.ogg').
+nth(17, '17th.ogg').
+
+
+%%% distance measure
+distance(Dist) == T :- Dist < 1000, dist(Dist, F), append(F, 'meters-10-e.ogg',T).
+dist(D, ['10.ogg']) :-  D < 20, !.
+dist(D, ['20.ogg']) :-  D < 30, !.
+dist(D, ['30.ogg']) :-  D < 40, !.
+dist(D, ['40.ogg']) :-  D < 50, !.
+dist(D, ['50.ogg']) :-  D < 60, !.
+dist(D, ['60.ogg']) :-  D < 70, !.
+dist(D, ['70.ogg']) :-  D < 80, !.
+dist(D, ['80.ogg']) :-  D < 90, !.
+dist(D, ['90.ogg']) :-  D < 100, !.
+dist(D, ['100.ogg']) :-  D < 150, !.
+dist(D, ['100_and.ogg', 'and_50.ogg']) :-  D < 200, !.
+dist(D, ['200.ogg']) :-  D < 250, !.
+dist(D, ['200_and.ogg', 'and_50.ogg']) :-  D < 300, !.
+dist(D, ['300.ogg']) :-  D < 350, !.
+dist(D, ['300_and.ogg', 'and_50.ogg']) :-  D < 400, !.
+dist(D, ['400.ogg']) :-  D < 450, !.
+dist(D, ['400_and.ogg', 'and_50.ogg']) :-  D < 500, !.
+dist(D, ['500.ogg']) :-  D < 550, !.
+dist(D, ['500_and.ogg', 'and_50.ogg']) :-  D < 600, !.
+dist(D, ['600.ogg']) :-  D < 650, !.
+dist(D, ['600_and.ogg', 'and_50.ogg']) :-  D < 700, !.
+dist(D, ['700.ogg']) :-  D < 750, !.
+dist(D, ['700_and.ogg', 'and_50.ogg']) :-  D < 800, !.
+dist(D, ['800.ogg']) :-  D < 850, !.
+dist(D, ['800_and.ogg', 'and_50.ogg']) :-  D < 900, !.
+dist(D, ['900.ogg']) :-  D < 950, !.
+dist(D, ['900_and.ogg', 'and_50.ogg']) :-  !.
+
+
+distance(Dist) == ['more_than.ogg', '1.ogg', 'kilometer-e.ogg'] :- Dist < 1500.
+distance(Dist) == ['more_than.ogg', '2.ogg', 'kilometers-1-2-e.ogg'] :- Dist < 3000.
+distance(Dist) == ['more_than.ogg', '3.ogg', 'kilometers-1-2-e.ogg'] :- Dist < 4000.
+distance(Dist) == ['more_than.ogg', '4.ogg', 'kilometers-1-2-e.ogg'] :- Dist < 5000.
+distance(Dist) == ['more_than.ogg', '5.ogg', 'kilometers-200-e.ogg'] :- Dist < 6000.
+distance(Dist) == ['more_than.ogg', '6.ogg', 'kilometers-200-e.ogg'] :- Dist < 7000.
+distance(Dist) == ['more_than.ogg', '7.ogg', 'kilometers-200-e.ogg'] :- Dist < 8000.
+distance(Dist) == ['more_than.ogg', '8.ogg', 'kilometers-200-e.ogg'] :- Dist < 9000.
+distance(Dist) == ['more_than.ogg', '9.ogg', 'kilometers-200-e.ogg'] :- Dist < 10000.
+distance(Dist) == ['more_than.ogg', X, 'kilometers-200-e.ogg'] :- D is Dist/1000, dist(D, X).
+
+
+
+%% resolve command main method
+%% if you are familar with Prolog you can input specific to the whole mechanism,
+%% by adding exception cases.
+flatten(X, Y) :- flatten(X, [], Y), !.
+flatten([], Acc, Acc).
+flatten([X|Y], Acc, Res):- 
+		flatten(Y, Acc, R), flatten(X, R, Res).
+flatten(X, Acc, [X|Acc]).
+
+resolve(X, Y) :- resolve_impl(X,Z), flatten(Z, Y).
+resolve_impl([],[]).
+resolve_impl([X|Rest], List) :- resolve_impl(Rest, Tail), ((X == L) -> append(L, Tail, List); List = Tail).
\ No newline at end of file