diff --git a/asm-build.properties b/asm-build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..915f74ce19ea3f35a784a887b21c6d8f1febdb21
--- /dev/null
+++ b/asm-build.properties
@@ -0,0 +1 @@
+eclipse.home=D:/work/eclipse-SDK-4.9/eclipse
\ No newline at end of file
diff --git a/src/de/loskutov/bco/asm/CommentedASMifierClassVisitor.java b/src/de/loskutov/bco/asm/CommentedASMifierClassVisitor.java
index fb8ca51213cbd828be0398d223d4585647701cc1..7d374c24d08c35d889e2616a911d6e5110e36dc7 100644
--- a/src/de/loskutov/bco/asm/CommentedASMifierClassVisitor.java
+++ b/src/de/loskutov/bco/asm/CommentedASMifierClassVisitor.java
@@ -45,7 +45,7 @@ public class CommentedASMifierClassVisitor extends ASMifier implements ICommente
     private final ClassNode classNode;
 
     private CommentedASMifierClassVisitor(ClassNode classNode, final DecompilerOptions options, String name, int id) {
-        super(Opcodes.ASM6, name, id);
+        super(DecompilerOptions.LATEST_ASM_VERSION, name, id);
         this.classNode = classNode;
         this.options = options;
         showLines = options.modes.get(BCOConstants.F_SHOW_LINE_INFO);
@@ -320,7 +320,7 @@ public class CommentedASMifierClassVisitor extends ASMifier implements ICommente
 
     private ASMifier getDummyVisitor(){
         if (dummyAnnVisitor == null) {
-            dummyAnnVisitor = new ASMifier(Opcodes.ASM6, "", -1) {
+            dummyAnnVisitor = new ASMifier(DecompilerOptions.LATEST_ASM_VERSION, "", -1) {
                 @Override
                 public void visitAnnotationEnd() {
                     text.clear();
diff --git a/src/de/loskutov/bco/asm/CommentedClassVisitor.java b/src/de/loskutov/bco/asm/CommentedClassVisitor.java
index 87cda0293dd85ac6263235903628eb5a0ca384c7..da691d465f17438f6aa36d4a586842a05e81a233 100644
--- a/src/de/loskutov/bco/asm/CommentedClassVisitor.java
+++ b/src/de/loskutov/bco/asm/CommentedClassVisitor.java
@@ -44,7 +44,7 @@ public class CommentedClassVisitor extends Textifier implements ICommentedClassV
     private int currentInsn;
 
     public CommentedClassVisitor(ClassNode classNode, final DecompilerOptions options) {
-        super(Opcodes.ASM6);
+        super(DecompilerOptions.LATEST_ASM_VERSION);
         this.classNode = classNode;
         this.options = options;
         raw = !options.modes.get(BCOConstants.F_SHOW_RAW_BYTECODE);
@@ -573,7 +573,7 @@ public class CommentedClassVisitor extends Textifier implements ICommentedClassV
 
     private Textifier getDummyVisitor(){
         if (dummyAnnVisitor == null) {
-            dummyAnnVisitor = new Textifier(Opcodes.ASM6) {
+            dummyAnnVisitor = new Textifier(DecompilerOptions.LATEST_ASM_VERSION) {
                 @Override
                 public void visitAnnotationEnd() {
                     text.clear();
diff --git a/src/de/loskutov/bco/asm/DecompilerHelper.java b/src/de/loskutov/bco/asm/DecompilerHelper.java
index 32b9f1a6b538efde4cdb8d6aa79bed4c00521bd4..528cfab07bdef0abf3c71de40dfabb76fc66acc4 100644
--- a/src/de/loskutov/bco/asm/DecompilerHelper.java
+++ b/src/de/loskutov/bco/asm/DecompilerHelper.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.util.Printer;
 import org.objectweb.asm.util.TraceClassVisitor;
@@ -28,7 +27,7 @@ public class DecompilerHelper  {
     public static DecompiledClass getDecompiledClass(final byte[] bytes,
         DecompilerOptions options) throws UnsupportedClassVersionError {
         ClassReader cr = new ClassReader(bytes);
-        ClassNode cn = new ClassNode(Opcodes.ASM6);
+        ClassNode cn = new ClassNode(DecompilerOptions.LATEST_ASM_VERSION);
         int crFlags = 0;
         if(options.modes.get(BCOConstants.F_EXPAND_STACKMAP)) {
             crFlags |= ClassReader.EXPAND_FRAMES;
diff --git a/src/de/loskutov/bco/asm/DecompilerOptions.java b/src/de/loskutov/bco/asm/DecompilerOptions.java
index 71739d33becc7291eadd5ac450e85929229d0469..9f5d28fa2d613cfd546a48c54f87cef1e1252177 100644
--- a/src/de/loskutov/bco/asm/DecompilerOptions.java
+++ b/src/de/loskutov/bco/asm/DecompilerOptions.java
@@ -13,7 +13,7 @@ import org.objectweb.asm.Opcodes;
 
 public class DecompilerOptions {
 
-    public static int LATEST_VERSION = Opcodes.ASM7_EXPERIMENTAL;
+    public static int LATEST_ASM_VERSION = Opcodes.ASM7_EXPERIMENTAL;
 
     public final String fieldFilter;
     public final String methodFilter;