diff --git a/Makefile b/Makefile
index 8687312..288a17b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 all: core modules
-OPENMP_MODE ?= 0
+OPENMP_MODE ?= omp
 
 core:
 	cd build; OPENMP_MODE=$(OPENMP_MODE) make srw
diff --git a/build/Makefile b/build/Makefile
index 459a32b..07e68bb 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -5,8 +5,8 @@ TMP_DIR = $(ORIGDIR)/tmp
 SRC_DIR = $(ORIGDIR)/sources
 PYTHON_TOMO = $(BIN_DIR)/python
 
-OPENMP_MODE ?= 0
-#OPENMP_MODE = omp   #uncoment here for openmp with fftw2 (crashed on maxwell)
+#OPENMP_MODE ?= 0
+OPENMP_MODE ?= omp   #uncoment here for openmp with fftw2
 
 .PHONY: all srw
 
@@ -24,10 +24,17 @@ clean:
 srw:
 	mkdir -p $(TMP_DIR)
 	mkdir -p $(BUILD_DIR)/sources
+	
 	# SRW commit. Switch from FFTW-2.1.5 to FFTW-3.3.8 (for 64-bit versions)
-	wget --no-check-certificate -nc -O $(SRC_DIR)/srw.zip https://github.com/ochubar/SRW/archive/5d3d4cff1e64f6c6587a5731fb94efdb4612c06e.zip; echo 'Done'
+	#wget --no-check-certificate -nc -O $(SRC_DIR)/srw.zip https://github.com/ochubar/SRW/archive/5d3d4cff1e64f6c6587a5731fb94efdb4612c06e.zip; echo 'Done'
+	#unzip -o $(SRC_DIR)/srw.zip -d $(TMP_DIR)/
+	#mv $(TMP_DIR)/SRW-5d3d4cff1e64f6c6587a5731fb94efdb4612c06e $(TMP_DIR)/SRW
+	
+	# SY commit to fix OpenMP crashing
+	wget --no-check-certificate -nc -O $(SRC_DIR)/srw.zip https://github.com/SergeyYakubov/SRW/archive/openmp_memoryfix.zip; echo 'Done'
 	unzip -o $(SRC_DIR)/srw.zip -d $(TMP_DIR)/
-	mv $(TMP_DIR)/SRW-5d3d4cff1e64f6c6587a5731fb94efdb4612c06e $(TMP_DIR)/SRW
+	mv $(TMP_DIR)/SRW-openmp_memoryfix $(TMP_DIR)/SRW
+	
 	patch $(TMP_DIR)/SRW/cpp/py/Makefile py3.patch
 	cd $(TMP_DIR)/SRW; MODE=$(OPENMP_MODE) make all;
 	mkdir -p $(BUILD_DIR)/lib