diff --git a/.travis.yml b/.travis.yml
index d568af5d1..d2ad176f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
 script:
   - echo "CXX="$CXX
   - echo "CC="$CC
-  - cmake . -DBUILD_PYBULLET=OFF -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror
+  - cmake . -DBUILD_PYBULLET=ON -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror
   - make -j8
   - ctest -j8 --output-on-failure
   # Build again with double precision
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8eb1c0b44..8e5f009df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,30 +303,15 @@ ENDIF()
 OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON)
 
 OPTION(BUILD_PYBULLET "Set when you want to build pybullet (Python bindings for Bullet)" OFF)
-IF(BUILD_PYBULLET)
-	# Optional Python configuration
-	# builds pybullet automatically if all the requirements are met
-	SET(PYTHON_VERSION_PYBULLET "2.7" CACHE STRING "Python version pybullet will use.")
-	SET(Python_ADDITIONAL_VERSIONS 2.7 2.7.3 3 3.0 3.1 3.2 3.3 3.4 3.5 3.6)
-	SET_PROPERTY(CACHE PYTHON_VERSION_PYBULLET PROPERTY STRINGS ${Python_ADDITIONAL_VERSIONS})
-	SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build3/cmake ${CMAKE_MODULE_PATH})
-	OPTION(EXACT_PYTHON_VERSION "Require Python and match PYTHON_VERSION_PYBULLET exactly, e.g. 2.7.3" OFF)
-	IF(EXACT_PYTHON_VERSION)
-  	set(EXACT_PYTHON_VERSION_FLAG EXACT REQUIRED)
-	ENDIF(EXACT_PYTHON_VERSION)
-	# first find the python interpreter
-	FIND_PACKAGE(PythonInterp ${PYTHON_VERSION_PYBULLET} ${EXACT_PYTHON_VERSION_FLAG})
-	# python library should exactly match that of the interpreter
-	FIND_PACKAGE(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
-ENDIF()
 
 OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON)
 OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON)
 
 
 IF(BUILD_PYBULLET)
-
-	OPTION(BUILD_PYBULLET_NUMPY "Set when you want to build pybullet with NumPy support" ON)
+	FIND_PACKAGE(PythonLibs)
+	
+	OPTION(BUILD_PYBULLET_NUMPY "Set when you want to build pybullet with NumPy support" OFF)
 	OPTION(BUILD_PYBULLET_ENET "Set when you want to build pybullet with enet UDP networking support" ON)
 	OPTION(BUILD_PYBULLET_CLSOCKET "Set when you want to build pybullet with enet TCP networking support" ON)