diff --git a/CMakeLists.txt b/CMakeLists.txt
index e36222aa..d204441f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,13 +52,24 @@ list( APPEND PepSIRF_LINK_LIBS
 )
 
 if(OpenMP_FOUND)
-  message( "OpenMP enabled" )
-  list( APPEND PepSIRF_LINK_LIBS OpenMP::OpenMP_CXX )
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp")
-  add_definitions( -DENABLE_OPENMP )
+  message("OpenMP enabled")
+  
+  if(APPLE)
+    # Get libomp filepath
+    execute_process(COMMAND brew --prefix libomp OUTPUT_VARIABLE BREW_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+      
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I${BREW_PREFIX}/include")
+    list(APPEND PepSIRF_LINK_LIBS "${BREW_PREFIX}/lib/libomp.dylib")
+  else()
+    list(APPEND PepSIRF_LINK_LIBS OpenMP::OpenMP_CXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp")
+  endif()
+
+  # Define OpenMP macro
+  add_definitions(-DENABLE_OPENMP)
 
 else()
-  message( "WARNING: OpenMP not found, parallelism disabled." )
+  message("WARNING: OpenMP not found, parallelism disabled.")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-unused-value")
 endif()
 
diff --git a/include/modules/core/pepsirf_version.h b/include/modules/core/pepsirf_version.h
index 45e5100d..0ab5e07e 100644
--- a/include/modules/core/pepsirf_version.h
+++ b/include/modules/core/pepsirf_version.h
@@ -1,6 +1,6 @@
 #ifndef PEPSIRF_VERSION_HH_INCLUDED
 #define PEPSIRF_VERSION_HH_INCLUDED
 
-#define PEPSIRF_VERSION "1.6.0"
+#define PEPSIRF_VERSION "1.7.0"
 
 #endif
diff --git a/src/modules/deconv/module_deconv.cpp b/src/modules/deconv/module_deconv.cpp
index b3ed0fbb..a66eefba 100644
--- a/src/modules/deconv/module_deconv.cpp
+++ b/src/modules/deconv/module_deconv.cpp
@@ -11,6 +11,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/iterator_range.hpp>
+#include <boost/filesystem.hpp>
 #include <algorithm>
 #include <type_traits>
 
@@ -67,7 +68,7 @@ void module_deconv::run(options *opts)
             );
         }
 
-        auto in_dir_iter = fs_tools::directory_iterator(input_base);
+        auto in_dir_iter = boost::filesystem::directory_iterator(input_base);
 
         for (auto& input_f : boost::make_iterator_range(in_dir_iter, {}))
         {