diff --git a/CMakeLists.txt b/CMakeLists.txt
index 220ee53ba5b9bd290ac97172e4d89184a0391d6b..92f15b9cc52511b306b8bc4f7c81e31e10d16407 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,8 +154,14 @@ add_dependencies(RelaxSE_lib RelaxSE_type)
 add_dependencies(RelaxSE_lib RelaxSE_IO)
 add_dependencies(RelaxSE_lib RelaxSE_common)
 
+if(ENABLE_DEV)
+add_library(RelaxSE_prop
+  ${RELAXSE_SOURCES_prop}
+  ${RELAXSE_dev})
+else()
 add_library(RelaxSE_prop
   ${RELAXSE_SOURCES_prop})
+endif()
 add_dependencies(RelaxSE_prop RelaxSE_type)
 add_dependencies(RelaxSE_prop RelaxSE_IO)
 add_dependencies(RelaxSE_prop RelaxSE_common)
@@ -197,7 +203,7 @@ if(ENABLE_NOGEN)
   
   execute_process(COMMAND cp -r ${CMAKE_SOURCE_DIR}/src/generator/update_gencode.sh ${CMAKE_BINARY_DIR}/)
 
-  ### SASS program
+  ### RelaxSE program (nogen)
   add_executable(relaxse.x src/RelaxSE.F90)
   target_link_libraries(relaxse.x
   RelaxSE_lib
@@ -208,7 +214,7 @@ if(ENABLE_NOGEN)
   ${BLAS_LIBRARIES}
   )
 else()
-  ### SASS program
+  ### RelaxSE program (gen)
   add_executable(relaxse.x src/RelaxSE.F90)
   target_link_libraries(relaxse.x
     RelaxSE_lib
diff --git a/cmake/RelaxSE_Sources.cmake b/cmake/RelaxSE_Sources.cmake
index 3b710af7be85adf6601ad33cc2a2a97484e97680..8763992c1ac82e447ff2bc1b7779c94ff0770591 100644
--- a/cmake/RelaxSE_Sources.cmake
+++ b/cmake/RelaxSE_Sources.cmake
@@ -94,8 +94,4 @@ set(RELAXSE_gen_SOURCES
   )
 
 
-set(RELAXSE_SOURCES_prop
-  src/generator/dev/dens.F90	
-)
-
 include(RelaxSE_prop)
diff --git a/cmake/RelaxSE_dev.cmake b/cmake/RelaxSE_dev.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..08cbe3855d335b9ca2965bdb11a51d748edf7afc
--- /dev/null
+++ b/cmake/RelaxSE_dev.cmake
@@ -0,0 +1,3 @@
+set(RELAXSE_dev
+  src/generator/dev/dens.F90
+  )
diff --git a/cmake/RelaxSE_prop.cmake b/cmake/RelaxSE_prop.cmake
index ea6f0f60b56abb9b3884edc73a11b3dcd646b140..e4619504b8f6c5cb2b727d0e483ca5828ac9d7be 100644
--- a/cmake/RelaxSE_prop.cmake
+++ b/cmake/RelaxSE_prop.cmake
@@ -3,6 +3,8 @@ set(RELAXSE_SOURCES_prop
   src/lect_data_prop.F90
   src/def_files_prop.F90	
   src/init_prop.F90
-  src/info_prop.F90
-  src/generator/dev/dens.F90	
+  src/info_prop.F90	
   )
+
+
+
diff --git a/configure b/configure
index d94e70001813a6e888809cc8655dd80205451143..f27262a6a9462dc7df2e860c479a940962e8a6bb 100755
--- a/configure
+++ b/configure
@@ -84,6 +84,10 @@ def parse_input():
             action='store_true',
             default=False,
             help='disable generated code [default: %(default)s]')
+    group.add_argument('--dev',
+            action='store_true',
+            default=False,
+            help='enable development code [default: %(default)s]')
     
     group = parser.add_argument_group('parallelization')
     group.add_argument('--mpi',
@@ -154,6 +158,7 @@ def gen_cmake_command(args):
     command += ' -DENABLE_MPI=%s'            % translate_cmake(args.mpi)
     command += ' -DENABLE_OMP=%s'            % translate_cmake(args.omp)
     command += ' -DENABLE_NOGEN=%s'          % translate_cmake(args.nogen)
+    command += ' -DENABLE_DEV=%s'          % translate_cmake(args.dev)
                
     if args.build_type:
         command += ' -DCMAKE_BUILD_TYPE=%s' % args.build_type