diff --git a/README.md b/README.md
index 9681e968..be3acf60 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@
 
 For Win32:
 * VLD_DIR - .../Visual Leak Detector
+* path - apped path to git.exe
 
 ##### Settings
 
diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt
index b7ae4a55..84c843c3 100644
--- a/bin/test/data/log/test_log.txt
+++ b/bin/test/data/log/test_log.txt
@@ -12,7 +12,7 @@ Storage.cpp INFO: field: A::count <input.cc 21:13 21:17>
 Storage.cpp INFO: class: B <input.cc 24:7 24:7>
 Storage.cpp INFO: inheritance: B : A <input.cc 25:4 25:11>
 Storage.cpp INFO: method: B::process <input.cc 28:15 28:21>
-Storage.cpp INFO: override: A::process -> B::process < 0:0 0:0>
+Storage.cpp INFO: override: A::process -> B::process <input.cc 28:15 28:21>
 Storage.cpp INFO: type usage: B::process -> int <input.cc 30:3 30:5>
 Storage.cpp INFO: function: _main_ <input.cc 34:5 34:10>
 Storage.cpp INFO: type usage: _main_ -> B <input.cc 36:2 36:2>
@@ -44,7 +44,7 @@ Storage.cpp INFO: field: A::count <input.cc 17:13 17:17>
 Storage.cpp INFO: class: B <input.cc 20:7 20:7>
 Storage.cpp INFO: inheritance: B : A <input.cc 21:4 21:11>
 Storage.cpp INFO: method: B::process <input.cc 24:15 24:21>
-Storage.cpp INFO: override: A::process -> B::process < 0:0 0:0>
+Storage.cpp INFO: override: A::process -> B::process <input.cc 24:15 24:21>
 Storage.cpp INFO: type usage: B::process -> int <input.cc 26:3 26:5>
 Storage.cpp INFO: function: main <input.cc 30:5 30:8>
 Storage.cpp INFO: type usage: main -> B <input.cc 32:2 32:2>
@@ -101,7 +101,7 @@ Storage.cpp INFO: struct: StructB <file.cpp 1:0 1:0>
 Storage.cpp INFO: inheritance: StructB : StructA <file.cpp 1:5 1:5>
 Storage.cpp INFO: method: A::isMethod <file.cpp 1:9 1:9>
 Storage.cpp INFO: method: B::isMethod <file.cpp 1:7 1:7>
-Storage.cpp INFO: override: A::isMethod -> B::isMethod < 0:0 0:0>
+Storage.cpp INFO: override: A::isMethod -> B::isMethod <file.cpp 1:4 1:4>
 Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
 Storage.cpp INFO: function: func <file.cpp 1:0 1:0>
 Storage.cpp INFO: call: isTrue -> func <file.cpp 1:9 1:9>
diff --git a/cmake/version.cmake b/cmake/version.cmake
index b0f29c6d..743403d6 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -1,29 +1,30 @@
 # simple check for a git repo
 if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+	find_package(Git)
 
     execute_process(
-        COMMAND git rev-parse --abbrev-ref HEAD
+        COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_BRANCH
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
     execute_process(
-        COMMAND git log -1 --format=%h
+        COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_COMMIT_HASH
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
     execute_process(
-        COMMAND git log -1 --format=%ci
+        COMMAND ${GIT_EXECUTABLE} log -1 --format=%ci
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_COMMIT_TIME
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
     execute_process(
-        COMMAND git describe --long --match "[0-9]*" --abbrev=7 HEAD
+        COMMAND ${GIT_EXECUTABLE} describe --long --match "[0-9]*" --abbrev=7 HEAD
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_VERSION_NUMBER
         OUTPUT_STRIP_TRAILING_WHITESPACE
diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll
index 94d35e9a..af541cbb 100644
Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll and b/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll
index 5d4f2db1..5b6becb2 100644
Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll and b/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll
index cbb3d5d4..4810e36b 100644
Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll and b/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/icudt51.dll b/setup/dynamic_libraries/windows/app/Debug/icudt51.dll
deleted file mode 100644
index 756ce1ae..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/icudt51.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/icuin51.dll b/setup/dynamic_libraries/windows/app/Debug/icuin51.dll
deleted file mode 100644
index 403c1a5d..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/icuin51.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/icuuc51.dll b/setup/dynamic_libraries/windows/app/Debug/icuuc51.dll
deleted file mode 100644
index 48d6c281..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/icuuc51.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/libEGLd.dll b/setup/dynamic_libraries/windows/app/Debug/libEGLd.dll
deleted file mode 100644
index 72e3e60c..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/libEGLd.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/libGLESv2d.dll b/setup/dynamic_libraries/windows/app/Debug/libGLESv2d.dll
deleted file mode 100644
index 1f15927d..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/libGLESv2d.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll b/setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll
deleted file mode 100644
index e6874c16..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll
index 4fe842d4..bfab237e 100644
Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll and b/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll
index 29bb452d..d9f8aaf1 100644
Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll and b/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll
index 42563618..b4171506 100644
Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll and b/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Release/icudt51.dll b/setup/dynamic_libraries/windows/app/Release/icudt51.dll
deleted file mode 100644
index 756ce1ae..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/icudt51.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/icuin51.dll b/setup/dynamic_libraries/windows/app/Release/icuin51.dll
deleted file mode 100644
index 403c1a5d..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/icuin51.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/icuuc51.dll b/setup/dynamic_libraries/windows/app/Release/icuuc51.dll
deleted file mode 100644
index 48d6c281..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/icuuc51.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/libEGL.dll b/setup/dynamic_libraries/windows/app/Release/libEGL.dll
deleted file mode 100644
index af72f2cf..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/libEGL.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/libGLESv2.dll b/setup/dynamic_libraries/windows/app/Release/libGLESv2.dll
deleted file mode 100644
index 4c933636..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/libGLESv2.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll b/setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll
deleted file mode 100644
index d983de2c..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll and /dev/null differ
diff --git a/src/app/qt/element/QtCodeSnippet.cpp b/src/app/qt/element/QtCodeSnippet.cpp
index e3aa17ef..e863b31f 100644
--- a/src/app/qt/element/QtCodeSnippet.cpp
+++ b/src/app/qt/element/QtCodeSnippet.cpp
@@ -42,14 +42,14 @@ std::shared_ptr<QtCodeSnippet> QtCodeSnippet::merged(QtCodeSnippet* a, QtCodeSni
 
 	std::string title = first->m_title ? first->m_title->text().toStdString() : "";
 
-	return std::make_shared<QtCodeSnippet>(
+	return std::shared_ptr<QtCodeSnippet>(new QtCodeSnippet(
 		first->getStartLineNumber(),
 		title,
 		first->m_titleId,
 		code,
 		locationFile,
 		file
-	);
+	));
 }
 
 QtCodeSnippet::QtCodeSnippet(