diff --git a/CARLA.sublime-project b/CARLA.sublime-project
index caa5bc2bb..c119c3665 100644
--- a/CARLA.sublime-project
+++ b/CARLA.sublime-project
@@ -48,6 +48,18 @@
 	},
 	"build_systems":
 	[
+		{
+			"name": "CARLA - Pylint",
+			"working_dir": "${project_path}",
+			"file_regex": "^\\[([^:]*):([0-9]+):?([0-9]+)?\\]:? (.*)$",
+			"shell_cmd": "pylint --disable=R,C --rcfile=PythonClient/.pylintrc PythonClient/carla PythonClient/*.py --msg-template='[{path}:{line:3d}:{column}]: {msg_id} {msg}'"
+		},
+		{
+			"name": "CARLA - CppCheck",
+			"working_dir": "${project_path}",
+			"file_regex": "^\\[([^:]*):([0-9]+):?([0-9]+)?\\]:? (.*)$",
+			"shell_cmd": "cppcheck . -iBuild -i.pb.cc --error-exitcode=0 --enable=warning --quiet"
+		},
 		{
 			"name": "CARLA - Rebuild script",
 			"working_dir": "${project_path}",
diff --git a/README.md b/README.md
index f4823a8a3..0988cfaab 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 CARLA Simulator
 ===============
 
+[![Build Status](https://travis-ci.org/carla-simulator/carla.svg?branch=master)](https://travis-ci.org/carla-simulator/carla)
+
 CARLA is an open-source simulator for autonomous driving research. CARLA has
 been developed from the ground up to support development, training, and
 validation of autonomous urban driving systems. In addition to open-source code
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp
index 58a2db67a..3d1108b27 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/DoublyConnectedEdgeList.cpp
@@ -44,7 +44,7 @@ namespace MapGen {
     using Dcel = DoublyConnectedEdgeList;
     // from [-pi, pi] to [0, 1].
     auto normalize = [](auto a) {
-      constexpr decltype(a) twoPi = 2.0 * 3.14159265359;
+      constexpr float twoPi = 2.0 * 3.14159265359;
       a /= twoPi;
       while (a >= 1.0) a -= 1.0;
       while (a <  0.0) a += 1.0;