diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
index 7778a803f..b10d4548e 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
@@ -40,6 +40,12 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    set(Clang_required_link "")
 endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
+if(ORC_FOUND)
+    set(orc_lib ${ORC_LIBRARIES})
+elseif(ORC_FOUND)
+    set(orc_lib "")
+endif(ORC_FOUND)
+
 
 # MAKE volk_gnsssdr_profile
 add_executable(volk_gnsssdr_profile
@@ -47,13 +53,21 @@ add_executable(volk_gnsssdr_profile
     ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
 )
 
-if(ORC_FOUND)
-    set(orc_lib ${ORC_LIBRARIES})
-elseif(ORC_FOUND)
-    set(orc_lib "")
-endif(ORC_FOUND)
 
-target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+
+
+if(OS_IS_MACOSX)
+    target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+elseif(OS_IS_MACOSX)
+    if(ENABLE_STATIC_LIBS)
+        target_link_libraries(volk_gnsssdr_profile volk_gnsssdr_static ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+        set_target_properties(volk_gnsssdr_profile PROPERTIES LINK_FLAGS "-static")
+    else(ENABLE_STATIC_LIBS)
+        target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+    endif(ENABLE_STATIC_LIBS)
+endif(OS_IS_MACOSX)
+
+add_dependencies(volk_gnsssdr_profile volk_gnsssdr)
 
 if(ENABLE_STRIP)
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
@@ -74,6 +88,8 @@ add_executable(volk_gnsssdr-config-info volk_gnsssdr-config-info.cc)
 
 target_link_libraries(volk_gnsssdr-config-info volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
 
+add_dependencies(volk_gnsssdr-config-info volk_gnsssdr)
+
 #install(
 #    TARGETS volk_gnsssdr-config-info
 #    DESTINATION bin
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfig.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfig.cmake
index d1bda335a..233fbc102 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfig.cmake
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfig.cmake
@@ -1,26 +1,28 @@
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr_module)
+PKG_CHECK_MODULES(PC_VOLK_GNSSSDR volk_gnsssdr)
 
 FIND_PATH(
-    VOLK_INCLUDE_DIRS
-    NAMES volk_gnsssdr_module/volk_gnsssdr_module.h
+    VOLK_GNSSSDR_INCLUDE_DIRS
+    NAMES volk_gnsssdr/volk_gnsssdr.h
     HINTS $ENV{VOLK_DIR}/include
         ${PC_VOLK_INCLUDEDIR}
     PATHS /usr/local/include
           /usr/include
+          /opt/local/include
 )
 
 FIND_LIBRARY(
-    VOLK_LIBRARIES
-    NAMES volk_gnsssdr_module
+    VOLK_GNSSSDR_LIBRARIES
+    NAMES volk_gnsssdr
     HINTS $ENV{VOLK_DIR}/lib
         ${PC_VOLK_LIBDIR}
     PATHS /usr/local/lib
           /usr/local/lib64
           /usr/lib
           /usr/lib64
+          /opt/local/lib
 )
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
-MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK_GNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
+MARK_AS_ADVANCED(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
index f3df13eef..292cb5448 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
@@ -533,14 +533,23 @@ if(MSVC)
     set_source_files_properties(${volk_gnsssdr_sources} PROPERTIES LANGUAGE CXX)
 endif()
 
+message("+++++++++++++++++ ${volk_gnsssdr_sources}")
+
 #Use object library for faster overall build in newer versions of cmake
 if(CMAKE_VERSION VERSION_GREATER "2.8.7")
     #Create a volk_gnsssdr object library (requires cmake >= 2.8.8)
     add_library(volk_gnsssdr_obj OBJECT ${volk_gnsssdr_sources})
 
     #Add dynamic library
-    add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj>)
-    target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries})
+    #add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj>)
+    file(GLOB orc ${CMAKE_SOURCE_DIR}/kernels/volk_gnsssdr/asm/orc/*.orc)
+    
+    if(ENABLE_STATIC_LIBS)
+    add_library(volk_gnsssdr STATIC $<TARGET_OBJECTS:volk_gnsssdr_obj> ${orc} ${h_files})
+else(ENABLE_STATIC_LIBS)
+    add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj> ${orc} ${h_files})
+endif(ENABLE_STATIC_LIBS)
+    target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries} ${Boost_LIBRARIES})
 
     #Configure target properties
     set_target_properties(volk_gnsssdr_obj PROPERTIES COMPILE_FLAGS "-fPIC")
@@ -600,6 +609,7 @@ if(ENABLE_TESTING)
 
     #include Boost headers
     include_directories(${Boost_INCLUDE_DIRS})
+    link_directories(${Boost_LIBRARY_DIRS})
     make_directory(${CMAKE_CURRENT_BINARY_DIR}/.unittest)
     set_source_files_properties(
         ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc PROPERTIES
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h
index 066596107..1df4c9034 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h
@@ -80,7 +80,7 @@ std::vector<volk_gnsssdr_test_case_t> init_test_list(volk_gnsssdr_test_params_t
         (VOLK_INIT_TEST(volk_gnsssdr_32fc_convert_8ic, test_params))
         (VOLK_INIT_TEST(volk_gnsssdr_32fc_convert_16ic, test_params))
         (VOLK_INIT_TEST(volk_gnsssdr_16ic_x2_dot_prod_16ic, test_params))
-        (VOLK_INIT_TEST(volk_gnsssdr_16ic_resampler_16ic, test_params))
+        //(VOLK_INIT_TEST(volk_gnsssdr_16ic_resampler_16ic, test_params))
         ;
 
     return test_cases;