diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..59bb2ba
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,112 @@
+cmake_minimum_required (VERSION 2.8)
+project (FastBVHNoSSE)
+
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) 
+
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo" CACHE STRING "Configuration types" FORCE)
+
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
+file(GLOB SRC_FILES
+    ${CMAKE_SOURCE_DIR}/*.h
+    ${CMAKE_SOURCE_DIR}/*.cpp
+)
+
+#######################################################################################
+
+#set (USE_MSVC_RUNTIME_LIBRARY_DLL true)
+#IF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
+#    #We statically link to reduce dependancies
+#    FOREACH(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RETAIL)
+#        IF(${flag_var} MATCHES "/MD")
+#            STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+#        ENDIF(${flag_var} MATCHES "/MD")
+#        IF(${flag_var} MATCHES "/MDd")
+#            STRING(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}")
+#        ENDIF(${flag_var} MATCHES "/MDd")
+#    ENDFOREACH(flag_var)
+#ENDIF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
+
+#######################################################################################
+
+foreach(f ${SRC_FILES})
+    # Get the path of the file relative to ${DIRECTORY},
+    # then alter it (not compulsory)
+    file(RELATIVE_PATH SRCGR ${CMAKE_SOURCE_DIR} ${f})
+    set(SRCGR "Sources/${SRCGR}")
+
+    # Extract the folder, ie remove the filename part
+    string(REGEX REPLACE "(.*)(/[^/]*)$" "\\1" SRCGR ${SRCGR})
+
+    # Source_group expects \\ (double antislash), not / (slash)
+    string(REPLACE / \\ SRCGR ${SRCGR})
+    source_group("${SRCGR}" FILES ${f})
+endforeach()
+
+set(ENABLE_HIDECONSOLE_BUILD TRUE CACHE BOOL "TRUE to hide console for Windows sys")
+
+if(WINDOWS)
+  set(GUI_TYPE WIN32)
+elseif(MACOSX)
+  set(GUI_TYPE MACOSX_BUNDLE)
+endif()
+
+if(MSVC)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+endif()
+
+
+SET(LINK_OPTIONS " ")
+SET(EXE_NAME "RayTracerTest")
+
+ADD_EXECUTABLE(${EXE_NAME} ${SRC_FILES})
+
+#--------------------------------------------------------------------
+# preproc
+#--------------------------------------------------------------------
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+add_definitions(-D__STDC_FORMAT_MACROS)
+add_definitions(-DBX_CONFIG_ENABLE_MSVC_LEVEL4_WARNINGS=1)
+add_definitions(-D__STDC_LIMIT_MACROS)
+add_definitions(-D__STDC_CONSTANT_MACROS)
+add_definitions(-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS)
+if(MSVC)
+add_definitions(-DWIN32)
+add_definitions(-D_WIN32)
+#add_definitions(-DNOMINMAX)
+endif()
+add_definitions(-DUSE_DL_PREFIX)
+add_definitions(-DGLEW_STATIC)
+
+#--------------------------------------------------------------------
+# output dirs
+#--------------------------------------------------------------------
+
+set_target_properties(${EXE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/bin )
+set_target_properties(${EXE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/bin )
+set_target_properties(${EXE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_SOURCE_DIR}/bin )
+set_target_properties(${EXE_NAME} PROPERTIES DEBUG_POSTFIX "_d")
+set_target_properties(${EXE_NAME} PROPERTIES RELWITHDEBINFO_POSTFIX "RelWithDebInfo")
+set_target_properties(${EXE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
+
+#--------------------------------------------------------------------
+# Hide the console window in visual studio projects
+#--------------------------------------------------------------------
+if(ENABLE_HIDECONSOLE_BUILD)
+if(MSVC)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+endif()
+endif()
+
+if(WINDOWS)
+set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
+set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+endif()
+
+if(ENABLE_HIDECONSOLE_BUILD)
+MESSAGE(STATUS "Console is hidden")
+else()
+MESSAGE(STATUS "Console is visible")
+endif()
+
diff --git a/Stopwatch.h b/Stopwatch.h
index fcd6f80..3707885 100644
--- a/Stopwatch.h
+++ b/Stopwatch.h
@@ -1,6 +1,7 @@
 #ifndef Stopwatch_h
 #define Stopwatch_h
 
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <sys/time.h>
 
 class Stopwatch {
@@ -17,5 +18,29 @@ class Stopwatch {
 	void reset() { start = _stopwatch(); }
 	double read() const {	return _stopwatch() - start; }
 };
+#else
 
+#include <numeric>
+#include <chrono>
+class Stopwatch {
+private:
+    std::chrono::time_point<std::chrono::system_clock> start;
+    std::chrono::time_point<std::chrono::system_clock>  _stopwatch() const
+    {
+        return std::chrono::system_clock::now();
+    }
+
+public:
+    Stopwatch() { reset(); }
+    void reset() { start = _stopwatch(); }
+
+    // return second
+    double read() const
+    {
+        std::chrono::duration<double> diff = _stopwatch() - start;
+        return diff.count();
+    }
+};
+
+#endif
 #endif