diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4009765
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+*~
+CMakeLists.txt.user*
+*.kdev*
+*.bak
+*.orig
+build/
+*.aux
+*.blg
+*.toc
+*.fdb_latexmk
+*.bbl
+*.log
+*.synctex.gz
+ceres.pdf
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70336ae..8213e6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@
 
 PROJECT(CERES C CXX)
 
-ENABLE_TESTING()
+INCLUDE(CTest)
 
 # SuiteSparse
 OPTION(SUITESPARSE
@@ -168,8 +168,20 @@
 
 IF (GFLAGS)
   MESSAGE("-- Check for Google Flags")
-  FIND_LIBRARY(GFLAGS_LIB NAMES gflags)
-  FIND_PATH(GFLAGS_INCLUDE NAMES gflags/gflags.h)
+  FIND_LIBRARY(GFLAGS_LIB
+    NAMES
+      gflags
+    PATH
+      /usr/lib
+      /usr/local/lib
+    )
+  FIND_PATH(GFLAGS_INCLUDE
+    NAMES
+      gflags/gflags.h
+    PATH
+      /usr/include
+      /usr/local/include
+    )
   IF (NOT EXISTS ${GFLAGS_LIB} OR NOT EXISTS ${GFLAGS_INCLUDE})
     MESSAGE(FATAL_ERROR
             "Can't find Google Flags. Please specify: "
@@ -184,8 +196,20 @@
 
 # Google Logging
 MESSAGE("-- Check for Google Log")
-FIND_LIBRARY(GLOG_LIB NAMES glog)
-FIND_PATH(GLOG_INCLUDE NAMES glog/logging.h)
+FIND_LIBRARY(GLOG_LIB
+  NAMES
+    glog
+  PATH
+    /usr/lib
+    /usr/local/lib
+)
+FIND_PATH(GLOG_INCLUDE
+  NAMES
+    glog/logging.h
+  PATH
+    /usr/include
+    /usr/local/include
+)
 IF (NOT EXISTS ${GLOG_LIB} OR NOT EXISTS ${GLOG_INCLUDE})
   MESSAGE(FATAL_ERROR
           "Can't find Google Log. Please specify: "
diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt
index f02db23..7891138 100644
--- a/internal/ceres/CMakeLists.txt
+++ b/internal/ceres/CMakeLists.txt
@@ -139,8 +139,7 @@
 
 TARGET_LINK_LIBRARIES(ceres ${CERES_LIBRARY_DEPENDENCIES})
 
-OPTION(BUILD_TESTS "Build the unit tests." ON)
-IF (BUILD_TESTS)
+IF (BUILD_TESTING)
   ADD_LIBRARY(gtest gmock_gtest_all.cc gmock_main.cc)
   ADD_LIBRARY(test_util test_util.cc)
   TARGET_LINK_LIBRARIES(gtest ${GFLAGS_LIB} ${GLOG_LIB})
@@ -193,4 +192,4 @@
   CERES_TEST(unsymmetric_linear_solver)
   CERES_TEST(visibility)
   CERES_TEST(visibility_based_preconditioner)
-ENDIF (BUILD_TESTS)
+ENDIF (BUILD_TESTING)