diff --git a/.classpath b/.classpath
index 104ebc64b78bf9a235b8ac0213244ad19c8e592a..746aedd4a8a0abefe9d06abf305758e1b10765cc 100644
--- a/.classpath
+++ b/.classpath
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/asm-debug-all-4.0_RC2.jar"/>
 	<classpathentry kind="lib" path="lib/jborat-interface.jar"/>
 	<classpathentry kind="lib" path="lib/jborat-runtime.jar"/>
+	<classpathentry kind="lib" path="lib/asm-debug-all-4.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.properties b/build.properties
index 7013017034e28614b2ab62b7229f58e3c385fd43..705afe699ca8af530065e8c8676cbfd02991801b 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-asm.path=lib/asm-debug-all-4.0_RC2.jar
+asm.path=lib/asm-debug-all-4.0.jar
 jborat-runtime.path=lib/jborat-runtime.jar
 jborat-interface.path=lib/jborat-interface.jar
 instr.jar.name=dislinstr.jar
diff --git a/lib/asm-debug-all-4.0_RC2.jar b/lib/asm-debug-all-4.0.jar
similarity index 78%
rename from lib/asm-debug-all-4.0_RC2.jar
rename to lib/asm-debug-all-4.0.jar
index 35707a08949ccaa81a583931db7809d5ab593e85..9562c999eda32d91eeb32e88d1d2cfb9cb2629fb 100644
Binary files a/lib/asm-debug-all-4.0_RC2.jar and b/lib/asm-debug-all-4.0.jar differ
diff --git a/src/ch/usi/dag/disl/dislclass/snippet/marker/AfterInitBodyMarker.java b/src/ch/usi/dag/disl/dislclass/snippet/marker/AfterInitBodyMarker.java
index 187a05316b7e1d3669b47d889c84803a09cfe199..77f1045f07519274e8229eb176e4698a9fdb3ef0 100644
--- a/src/ch/usi/dag/disl/dislclass/snippet/marker/AfterInitBodyMarker.java
+++ b/src/ch/usi/dag/disl/dislclass/snippet/marker/AfterInitBodyMarker.java
@@ -13,6 +13,8 @@ import ch.usi.dag.disl.util.Constants;
 
 public class AfterInitBodyMarker implements Marker {
 
+	// TODO ! not marking correctly
+	
 	// empty visitor for new AdviceAdapter
 	private static class EmptyMethodVisitor extends MethodVisitor {
 
diff --git a/test/.classpath b/test/.classpath
index 31ef341b668f9f5cab1c80fa6ea7ece1a343102d..8b7d2fb6e49a60f72a25cf8a9ba05167e9645f95 100644
--- a/test/.classpath
+++ b/test/.classpath
@@ -6,6 +6,6 @@
 	<classpathentry kind="lib" path="/DiSL/lib/jborat.jar"/>
 	<classpathentry kind="lib" path="lib/stp.jar"/>
 	<classpathentry kind="lib" path="/DiSL/lib/jborat-runtime.jar"/>
-	<classpathentry kind="lib" path="/DiSL/lib/asm-debug-all-4.0_RC2.jar"/>
+	<classpathentry kind="lib" path="/DiSL/lib/asm-debug-all-4.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/test/conf/lib.lst b/test/conf/lib.lst
index e1602df33bea54691b12d4a696829826552107b1..6497838d4ca184fba0d7d8f8c730d716ef1c9a6b 100644
--- a/test/conf/lib.lst
+++ b/test/conf/lib.lst
@@ -1,5 +1,5 @@
 # This is a sample configuration with relative paths
 # you can use full path using file:/// format 
-../lib/asm-debug-all-4.0_RC2.jar
+../lib/asm-debug-all-4.0.jar
 lib/remote-jborat.jar
 ../lib/jborat.jar
diff --git a/test/conf/udilib.lst b/test/conf/udilib.lst
index 5528df3b26ca117bd3c99e8845cd91a68ee1745e..5b105a0bee05276834629ca878811ba39bd9928a 100644
--- a/test/conf/udilib.lst
+++ b/test/conf/udilib.lst
@@ -1,5 +1,5 @@
 # This is a sample configuration with relative paths
 # you can use full path using file:/// format 
-../lib/asm-debug-all-4.0_RC2.jar
+../lib/asm-debug-all-4.0.jar
 ../build/disl-unspec.jar
 ../build/dislinstr.jar
diff --git a/test/lib/libjboratclientagent.so b/test/lib/libjboratclientagent.so
deleted file mode 100755
index ee95a7744aabd5d317072c10b454849a70726cd3..0000000000000000000000000000000000000000
Binary files a/test/lib/libjboratclientagent.so and /dev/null differ