diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc3ff391..60ff42e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@
         - ../../build/Release/test/Sourcetrail_test
 
 Linux64:
-    image: st4ll1/coati_linux_64
+    image: st4ll1/coati_64
     stage: deploy
     only:
         - master
@@ -21,7 +21,7 @@ Linux64:
         expire_in: 3 days
 
 Linux64_tag:
-    image: st4ll1/coati_linux_64
+    image: st4ll1/coati_64
     stage: deploy
     only:
         - tags
@@ -44,7 +44,7 @@ Linux64_manual:
             - Sourcetrail*.tar.gz
 
 Linux64_licenseGenerator:
-    image: st4ll1/coati_linux_64
+    image: st4ll1/coati_64
     stage: deploy
     when: manual
     script:
@@ -58,7 +58,7 @@ Linux64_licenseGenerator:
         expire_in: 3 days
 
 Linux32:
-    image: st4ll1/coati_linux_32
+    image: st4ll1/coati_32
     stage: deploy
     only:
         - master
@@ -71,7 +71,7 @@ Linux32:
         expire_in: 3 days
 
 Linux32_tag:
-    image: st4ll1/coati_linux_32
+    image: st4ll1/coati_32
     stage: deploy
     only:
         - tags
@@ -82,7 +82,7 @@ Linux32_tag:
             - Sourcetrail*.tar.gz
 
 Linux32_manual:
-    image: st4ll1/coati_linux_32
+    image: st4ll1/coati_32
     stage: deploy
     except:
         - master
diff --git a/README.md b/README.md
index 9d90de4d..a9d50553 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 * QT 5.8
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
-* Clang & LLVM 3.9 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.59
 * Botan 1.11.34
 
@@ -115,7 +115,7 @@ $ cd ../../../../../build_debug
 $ cmake -G Ninja -DLLVM_ENABLE_RTTI=ON ../llvm
 $ ninja -j4 check-all
 
-$ cd ../release_build
+$ cd ../build_release
 $ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RTTI=ON ../llvm
 $ ninja -j4 check-all
 
diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp
index 426acb03..d1089221 100644
--- a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp
+++ b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp
@@ -9,7 +9,7 @@ std::vector<FilePath> IndexerCommandCxxCdb::getSourceFilesFromCDB(const FilePath
 {
 	std::string error;
 	std::shared_ptr<clang::tooling::JSONCompilationDatabase> cdb = std::shared_ptr<clang::tooling::JSONCompilationDatabase>
-		(clang::tooling::JSONCompilationDatabase::loadFromFile(compilationDatabasePath.str(), error));
+		(clang::tooling::JSONCompilationDatabase::loadFromFile(compilationDatabasePath.str(), error, clang::tooling::JSONCommandLineSyntax::AutoDetect));
 
 	if (!error.empty())
 	{
diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp
index 6e16dbee..0e982999 100644
--- a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp
+++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp
@@ -416,7 +416,7 @@ bool CxxAstVisitor::TraverseTemplateArgumentLoc(const clang::TemplateArgumentLoc
 	return ret;
 }
 
-bool CxxAstVisitor::TraverseLambdaCapture(clang::LambdaExpr *lambdaExpr, const clang::LambdaCapture *capture)
+bool CxxAstVisitor::TraverseLambdaCapture(clang::LambdaExpr *lambdaExpr, const clang::LambdaCapture *capture, clang::Expr *Init)
 {
 	for (auto it = m_components.begin(); it != m_components.end(); it++)
 	{
diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h
index f7eaef62..215b750e 100644
--- a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h
+++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h
@@ -88,7 +88,7 @@ public:
 	virtual bool TraverseTemplateSpecializationTypeLoc(clang::TemplateSpecializationTypeLoc loc);
 	virtual bool TraverseUnresolvedLookupExpr(clang::UnresolvedLookupExpr* s);
 	virtual bool TraverseTemplateArgumentLoc(const clang::TemplateArgumentLoc& loc);
-	virtual bool TraverseLambdaCapture(clang::LambdaExpr* lambdaExpr, const clang::LambdaCapture* capture);
+	virtual bool TraverseLambdaCapture(clang::LambdaExpr* lambdaExpr, const clang::LambdaCapture* capture, clang::Expr *Init);
 	virtual bool TraverseBinComma(clang::BinaryOperator* s);
 
 #define OPERATOR(NAME) virtual bool TraverseBin##NAME##Assign(clang::CompoundAssignOperator *s) { return TraverseAssignCommon(s); }
diff --git a/src/lib_cxx/project/SourceGroupCxx.cpp b/src/lib_cxx/project/SourceGroupCxx.cpp
index 698ad043..7d248333 100644
--- a/src/lib_cxx/project/SourceGroupCxx.cpp
+++ b/src/lib_cxx/project/SourceGroupCxx.cpp
@@ -135,8 +135,7 @@ std::vector<std::shared_ptr<IndexerCommand>> SourceGroupCxx::getIndexerCommands(
 	{
 		std::string error;
 		std::shared_ptr<clang::tooling::JSONCompilationDatabase> cdb = std::shared_ptr<clang::tooling::JSONCompilationDatabase>
-			(clang::tooling::JSONCompilationDatabase::loadFromFile(cdbPath.str(), error));
-
+			(clang::tooling::JSONCompilationDatabase::loadFromFile(cdbPath.str(), error, clang::tooling::JSONCommandLineSyntax::AutoDetect));
 		if (!error.empty())
 		{
 			const std::string message = "Loading Clang compilation database failed with error: \"" + error + "\"";
diff --git a/src/lib_cxx/utility/CompilationDatabase.cpp b/src/lib_cxx/utility/CompilationDatabase.cpp
index 798339c3..06f2de9b 100644
--- a/src/lib_cxx/utility/CompilationDatabase.cpp
+++ b/src/lib_cxx/utility/CompilationDatabase.cpp
@@ -39,7 +39,7 @@ void  utility::CompilationDatabase::getHeaders()
 {
 	std::string error;
 	std::shared_ptr<clang::tooling::JSONCompilationDatabase> cdb = std::shared_ptr<clang::tooling::JSONCompilationDatabase>
-		(clang::tooling::JSONCompilationDatabase::loadFromFile(m_filename, error));
+		(clang::tooling::JSONCompilationDatabase::loadFromFile(m_filename, error, clang::tooling::JSONCommandLineSyntax::AutoDetect));
 
 	std::vector<clang::tooling::CompileCommand> commands = cdb->getAllCompileCommands();
 	std::set<FilePath> frameworkHeaders;