diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b0986a..cf86073 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,7 @@ endif() # NLA3D_USE_MKL
 find_package(EASYLOGGINGPP)
 if (EASYLOGGINGPP_FOUND)
   include_directories(${EASYLOGGINGPP_INCLUDE_DIR})
+  add_definitions(-DELPP_STL_LOGGING -DELPP_FEATURE_PERFORMANCE_TRACKING)
 else()
   message(WARNING "Can't find Easylogging++")
 endif()
diff --git a/cmake/modules/FindEASYLOGGINGPP.cmake b/cmake/modules/FindEASYLOGGINGPP.cmake
index 1aebc5e..b5870f4 100644
--- a/cmake/modules/FindEASYLOGGINGPP.cmake
+++ b/cmake/modules/FindEASYLOGGINGPP.cmake
@@ -1,6 +1,6 @@
 #   CMake module to find easylogging++ library
 include(FindPackageHandleStandardArgs)
-	
+
 FIND_PATH(
     EASYLOGGINGPP_INCLUDE_DIR
     easylogging++.h
@@ -11,5 +11,9 @@ FIND_PATH(
     PATHS ${CMAKE_CURRENT_SOURCE_DIR}/site-src/easyloggingpp/src
     DOC "Path to directory where easylogging++.h is stored"
 )
-	
+
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(EASYLOGGINGPP DEFAULT_MSG EASYLOGGINGPP_INCLUDE_DIR)
+
+if(EASYLOGGINGPP_FOUND)
+    set(EASYLOGGINGPP_SOURCE "${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc")
+endif()
diff --git a/site-src/easyloggingpp b/site-src/easyloggingpp
index 479fad2..b7b4cbf 160000
--- a/site-src/easyloggingpp
+++ b/site-src/easyloggingpp
@@ -1 +1 @@
-Subproject commit 479fad227f74c9ff69047b86298eab2d3e733167
+Subproject commit b7b4cbf8de1c7a85c45b7e17cdaff95b256b18a8
diff --git a/site-src/eigen b/site-src/eigen
index c357eb3..682aa93 160000
--- a/site-src/eigen
+++ b/site-src/eigen
@@ -1 +1 @@
-Subproject commit c357eb377661d0674e5bc1acab48a4957d3d671f
+Subproject commit 682aa9301c357c45f03dc6846eb0e48fd514e6cd
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 4ccfcb8..fec5c67 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -3,9 +3,9 @@ add_subdirectory (math)
 file (GLOB NLA3D_LIB_SOURCES "*.cpp" "materials/*.cpp" "elements/*.cpp")
 
 if (UNIX)
-    add_library(nla3d_lib SHARED ${NLA3D_LIB_SOURCES})
+    add_library(nla3d_lib SHARED ${NLA3D_LIB_SOURCES} ${EASYLOGGINGPP_SOURCE})
 else()
-    add_library(nla3d_lib STATIC ${NLA3D_LIB_SOURCES})
+    add_library(nla3d_lib STATIC ${NLA3D_LIB_SOURCES} ${EASYLOGGINGPP_SOURCE})
 endif()
 
 target_link_libraries(nla3d_lib math ${MKL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/src/lib/sys.h b/src/lib/sys.h
index cdabc52..1f14c60 100755
--- a/src/lib/sys.h
+++ b/src/lib/sys.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <iostream>
 #include <fstream>
-#include <strstream>
 #include <stdarg.h>
 #include <assert.h>
 #include <time.h>
@@ -21,7 +20,6 @@
 #include <algorithm>
 #include <stdlib.h>
 
-#define ELPP_STL_LOGGING
 #include "easylogging++.h"
 
 #define _USE_MATH_DEFINES