diff --git a/.gitignore b/.gitignore
index b2e5ffe858c28defec07efbbc2c0ba0bb753e9fc..eb709923764deab788ceab3be9acf16af920ee8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /drag.exe
+.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b81b018ad684f3a35fee301741b2734c8f4..0000000000000000000000000000000000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 53624c9e1f9ab0331fd10b32c26747519ace5794..0000000000000000000000000000000000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MakefileSettings">
-    <option name="linkedExternalProjectsSettings">
-      <MakefileProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-        <option name="version" value="2" />
-      </MakefileProjectSettings>
-    </option>
-  </component>
-  <component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4508ab1594d28b1eb35c6803bb356de58d233de..2d90233ae5d9ff01495dee55a0e707fa02ce265c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,10 @@ option(INCLUDE_CXX  "CXX build in mode"    OFF)
 project(INMCM_sfx)
 enable_language(Fortran)
 
+if (SFX_CHECK_NAN)
+    add_definitions(-DSFX_CHECK_NAN)
+endif ()
+
 if(INCLUDE_CXX)
     set(RUN_MACRO -DINCLUDE_CXX)
 endif(INCLUDE_CXX)
@@ -37,7 +41,7 @@ set(SOURCES_F
     srcF/FCWrapper.F90
 )
 
-set(HEADERS_F 
+set(HEADERS_F
     includeF/sfx_def.fi
 )
 
@@ -68,16 +72,16 @@ if(INCLUDE_CUDA)
 endif(INCLUDE_CUDA)
 
 if(INCLUDE_CXX OR INCLUDE_CUDA)
-    set(MEMPROC_SOURCES_CXX 
+    set(MEMPROC_SOURCES_CXX
         srcCXX/MemoryProcessing.cpp
     )
-    set(MEMPROC_HEADERS_CXX 
+    set(MEMPROC_HEADERS_CXX
         includeCXX/MemoryProcessing.h
         includeCXX/TemplateParameters.h
     )
 
     if(INCLUDE_CUDA)
-        set(MEMPROC_SOURCES_CU 
+        set(MEMPROC_SOURCES_CU
             srcCU/MemoryProcessing.cu
         )
         set(MEMPROC_HEADERS_CU
@@ -91,4 +95,11 @@ set(SOURCES ${MEMPROC_HEADERS_CU} ${MEMPROC_SOURCES_CU} ${MEMPROC_HEADERS_CXX} $
 set(CMAKE_Fortran_FLAGS " -cpp ")
 add_executable(drag ${SOURCES})
 add_definitions(${RUN_MACRO})
-set_property(TARGET drag PROPERTY LINKER_LANGUAGE Fortran)
\ No newline at end of file
+set_property(TARGET drag PROPERTY LINKER_LANGUAGE Fortran)
+
+#copy data on post build
+add_custom_command(
+        TARGET drag POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_SOURCE_DIR}/data
+        ${CMAKE_CURRENT_BINARY_DIR}/data)
\ No newline at end of file