diff --git a/java_indexer/build/build.sh b/java_indexer/build/build.sh
old mode 100644
new mode 100755
index 24ef7fb9..4a76f73a
--- a/java_indexer/build/build.sh
+++ b/java_indexer/build/build.sh
@@ -30,14 +30,23 @@ cd $ROOT_DIR
 
 mkdir -p classes
 
-LIB_DIR="./lib/"
 CLASSPATH=""
-CLASSPATH+=$LIB_DIR"java-symbol-solver-core-0.2.0-SNAPSHOT.jar;"
-CLASSPATH+=$LIB_DIR"java-symbol-solver-logic-0.2.0-SNAPSHOT.jar;"
-CLASSPATH+=$LIB_DIR"java-symbol-solver-model-0.2.0-SNAPSHOT.jar;"
-CLASSPATH+=$LIB_DIR"javaparser-core-2.4.1-SNAPSHOT.jar;"
+if [ $PLATFORM == "Windows" ]; then
+	LIB_DIR="./lib/"
+	CLASSPATH+=$LIB_DIR"java-symbol-solver-core.jar;"
+	CLASSPATH+=$LIB_DIR"java-symbol-solver-logic.jar;"
+	CLASSPATH+=$LIB_DIR"java-symbol-solver-model.jar;"
+	CLASSPATH+=$LIB_DIR"javaparser-core.jar"
+else
+	CLASSPATH+=$ROOT_DIR"/lib/java-symbol-solver-core.jar:"
+	CLASSPATH+=$ROOT_DIR"/lib/java-symbol-solver-logic.jar:"
+	CLASSPATH+=$ROOT_DIR"/lib/java-symbol-solver-model.jar:"
+	CLASSPATH+=$ROOT_DIR"/lib/javaparser-core.jar"
+fi
 
-javac.exe -d ./classes -classpath $CLASSPATH src/io/coati/*.java
+javac -d ./classes -classpath $CLASSPATH src/io/coati/*.java
+
+echo $CLASSPATH
 
 mkdir -p bin
 
diff --git a/java_indexer/src/io/coati/JavaIndexer.java b/java_indexer/src/io/coati/JavaIndexer.java
index b3d5bbc2..426d3273 100644
--- a/java_indexer/src/io/coati/JavaIndexer.java
+++ b/java_indexer/src/io/coati/JavaIndexer.java
@@ -73,7 +73,7 @@ public class JavaIndexer
 			}
 		}
 		
-		JavaParserFacade.clearCaches();
+		JavaParserFacade.clearInstances();
 		
 	//	String fileName = filePath.substring(filePath.lastIndexOf("/"), filePath.lastIndexOf(".java"));
 		
diff --git a/script/update_java_indexer.sh b/script/update_java_indexer.sh
old mode 100644
new mode 100755
diff --git a/setup/jars/windows/java-symbol-solver-core-0.2.0-SNAPSHOT.jar b/setup/jars/windows/java-symbol-solver-core.jar
similarity index 87%
rename from setup/jars/windows/java-symbol-solver-core-0.2.0-SNAPSHOT.jar
rename to setup/jars/windows/java-symbol-solver-core.jar
index 74462d9f..2214b856 100644
Binary files a/setup/jars/windows/java-symbol-solver-core-0.2.0-SNAPSHOT.jar and b/setup/jars/windows/java-symbol-solver-core.jar differ
diff --git a/setup/jars/windows/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar b/setup/jars/windows/java-symbol-solver-logic.jar
similarity index 83%
rename from setup/jars/windows/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar
rename to setup/jars/windows/java-symbol-solver-logic.jar
index d00bb421..2a56ec5a 100644
Binary files a/setup/jars/windows/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar and b/setup/jars/windows/java-symbol-solver-logic.jar differ
diff --git a/setup/jars/windows/java-symbol-solver-model-0.2.0-SNAPSHOT.jar b/setup/jars/windows/java-symbol-solver-model.jar
similarity index 85%
rename from setup/jars/windows/java-symbol-solver-model-0.2.0-SNAPSHOT.jar
rename to setup/jars/windows/java-symbol-solver-model.jar
index 72130d67..f3fa5bbc 100644
Binary files a/setup/jars/windows/java-symbol-solver-model-0.2.0-SNAPSHOT.jar and b/setup/jars/windows/java-symbol-solver-model.jar differ
diff --git a/setup/jars/windows/javaparser-core-2.4.1-SNAPSHOT.jar b/setup/jars/windows/javaparser-core.jar
similarity index 100%
rename from setup/jars/windows/javaparser-core-2.4.1-SNAPSHOT.jar
rename to setup/jars/windows/javaparser-core.jar
diff --git a/src/lib/JavaProject.cpp b/src/lib/JavaProject.cpp
index f89d54b6..023ae52d 100644
--- a/src/lib/JavaProject.cpp
+++ b/src/lib/JavaProject.cpp
@@ -21,22 +21,27 @@ JavaProject::JavaProject(std::shared_ptr<JavaProjectSettings> projectSettings, S
 	: Project(storageAccessProxy)
 	, m_projectSettings(projectSettings)
 {
+#ifdef _WIN32
+	const std::string separator = ";";
+#else
+	const std::string separator = ":";
+#endif
 	if (!JavaEnvironmentFactory::getInstance())
 	{
 		JavaEnvironmentFactory::createInstance(
-			"data/java/asm-5.0.3.jar;"
-			"data/java/cglib-3.1.jar;"
-			"data/java/easymock-3.3.1.jar;"
-			"data/java/guava-18.0.jar;"
-			"data/java/hamcrest-core-1.3.jar;"
-			"data/java/java-indexer.jar;"
-			"data/java/javaparser-core-2.4.1-SNAPSHOT.jar;"
-			"data/java/javaslang-2.0.0-beta.jar;"
-			"data/java/javassist-3.19.0-GA.jar;"
-			"data/java/java-symbol-solver-core-0.2.0-SNAPSHOT.jar;"
-			"data/java/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar;"
-			"data/java/java-symbol-solver-model-0.2.0-SNAPSHOT.jar;"
-			"data/java/objenesis-2.1.jar;"
+			"data/java/asm-5.0.3.jar" + separator +
+			"data/java/cglib-3.1.jar" + separator +
+			"data/java/easymock-3.3.1.jar" + separator +
+			"data/java/guava-18.0.jar" + separator +
+			"data/java/hamcrest-core-1.3.jar" + separator +
+			"data/java/java-indexer.jar" + separator +
+			"data/java/javaparser-core.jar" + separator +
+			"data/java/javaslang-2.0.0-beta.jar" + separator +
+			"data/java/javassist-3.19.0-GA.jar" + separator +
+			"data/java/java-symbol-solver-core.jar" + separator +
+			"data/java/java-symbol-solver-logic.jar" + separator +
+			"data/java/java-symbol-solver-model.jar" + separator +
+			"data/java/objenesis-2.1.jar" + separator
 		);
 	}
 }
diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h
index 03432750..5e6529a8 100644
--- a/src/test/JavaParserTestSuite.h
+++ b/src/test/JavaParserTestSuite.h
@@ -1043,12 +1043,12 @@ private:
 				"../app/data/java/guava-18.0.jar;"
 				"../app/data/java/hamcrest-core-1.3.jar;"
 				"../app/data/java/java-indexer.jar;"
-				"../app/data/java/javaparser-core-2.4.1-SNAPSHOT.jar;"
+				"../app/data/java/javaparser-core.jar;"
 				"../app/data/java/javaslang-2.0.0-beta.jar;"
 				"../app/data/java/javassist-3.19.0-GA.jar;"
-				"../app/data/java/java-symbol-solver-core-0.2.0-SNAPSHOT.jar;"
-				"../app/data/java/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar;"
-				"../app/data/java/java-symbol-solver-model-0.2.0-SNAPSHOT.jar;"
+				"../app/data/java/java-symbol-solver-core.jar;"
+				"../app/data/java/java-symbol-solver-logic.jar;"
+				"../app/data/java/java-symbol-solver-model.jar;"
 				"../app/data/java/objenesis-2.1.jar;");
 		}