diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59d45f8..cd7b943 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,50 +12,50 @@ file(GLOB SOURCE
 file(GLOB HEADERS
     "src/bncsutil/*.h"
 )
-set(CMAKE_MODULE_PATH CMake/Modules)
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake/Modules)
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE} ${HEADERS})
 add_library(${PROJECT_NAME}_static STATIC ${SOURCE} ${HEADERS})
 
 if (BUILD_32)
-       	set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
-        MESSAGE(STATUS "Excluding 64bit library paths from search.")
-       	set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
-	set(ARCH_RPM i686)
-        set(ARCH_DEB i386)
+    set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+    MESSAGE(STATUS "Excluding 64bit library paths from search.")
+    set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
+set(ARCH_RPM i686)
+    set(ARCH_DEB i386)
 elseif (BUILD_64)
-        set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
-	set(ARCH_DEB amd64)
-        set(ARCH_RM x86_64)
+    set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
+    set(ARCH_DEB amd64)
+    set(ARCH_RM x86_64)
 else()
-	set(ARCH_DEB amd64)
-        set(ARCH_RPM x86_64)
+    set(ARCH_DEB amd64)
+    set(ARCH_RPM x86_64)
 endif()
 
 if (USE_MPIR)
-	find_package(MPIR REQUIRED)
-	include_directories(src ${MPIR_INCLUDE_DIR})
-	target_link_libraries(${PROJECT_NAME} ${MPIR_LIBRARIES})
-	add_definitions(-DUSE_MPIR=1)
+    find_package(MPIR REQUIRED)
+    include_directories(src ${MPIR_INCLUDE_DIR})
+    target_link_libraries(${PROJECT_NAME} ${MPIR_LIBRARIES})
+    add_definitions(-DUSE_MPIR=1)
 else()
-	find_package(GMP REQUIRED)
-	include_directories(src ${GMP_INCLUDE_DIR})
-	target_link_libraries(${PROJECT_NAME} ${GMP_LIBRARIES})
+    find_package(GMP REQUIRED)
+    include_directories(src ${GMP_INCLUDE_DIR})
+    target_link_libraries(${PROJECT_NAME} ${GMP_LIBRARIES})
 endif()
 
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME bncsutil)
 
 if(UNIX)
-    	set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-	set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1)
+    set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+    set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1)
 
-    	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
-    	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
 endif()
 
 if (WIN32)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -DMUTIL_LIB_BUILD=1")
-	target_link_libraries(${PROJECT_NAME} Version.lib)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS -DMUTIL_LIB_BUILD=1)
+    target_link_libraries(${PROJECT_NAME} Version.lib)
 endif()
 
 install(TARGETS bncsutil RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)