diff --git a/.gitignore b/.gitignore
index 811cd61..678f988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
 .cache
 .settings/
 target/
+
+### for IntelliJ ###
+.idea/
+**/*.iml
diff --git a/jacoco-scala-maven-plugin-acceptance-tests/pom.xml b/jacoco-scala-maven-plugin-acceptance-tests/pom.xml
index 892162f..2204360 100644
--- a/jacoco-scala-maven-plugin-acceptance-tests/pom.xml
+++ b/jacoco-scala-maven-plugin-acceptance-tests/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>timezra.maven</groupId>
     <artifactId>jacoco-scala-maven-plugin-acceptance-tests</artifactId>
-    <version>0.6.3.2-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <name>JaCoCo Scala Maven Plugin Acceptance Tests</name>
     <url>https://github.com/timezra/jacoco-scala-maven-plugin</url>
 
diff --git a/jacoco-scala-maven-plugin/pom.xml b/jacoco-scala-maven-plugin/pom.xml
index 09257a6..048f957 100644
--- a/jacoco-scala-maven-plugin/pom.xml
+++ b/jacoco-scala-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     <groupId>timezra.maven</groupId>
     <artifactId>jacoco-scala-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>0.6.3.2-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <name>JaCoCo Scala Maven Plugin</name>
     <url>https://github.com/timezra/jacoco-scala-maven-plugin</url>
 
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.6.3.201306030806</version>
+            <version>0.7.0.201403182114</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/jacoco-scala-maven-plugin/src/main/java/timezra/maven/jacoco/scala/ReportMojo.java b/jacoco-scala-maven-plugin/src/main/java/timezra/maven/jacoco/scala/ReportMojo.java
index 2622229..fea44e1 100644
--- a/jacoco-scala-maven-plugin/src/main/java/timezra/maven/jacoco/scala/ReportMojo.java
+++ b/jacoco-scala-maven-plugin/src/main/java/timezra/maven/jacoco/scala/ReportMojo.java
@@ -34,7 +34,6 @@
 import org.jacoco.core.analysis.ICoverageNode;
 import org.jacoco.core.analysis.ICoverageVisitor;
 import org.jacoco.core.analysis.IMethodCoverage;
-import org.jacoco.core.data.ExecFileLoader;
 import org.jacoco.core.data.ExecutionData;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfoStore;
@@ -46,6 +45,7 @@
 import org.jacoco.core.internal.flow.ClassProbesVisitor;
 import org.jacoco.core.internal.flow.MethodProbesVisitor;
 import org.jacoco.core.internal.instr.InstrSupport;
+import org.jacoco.core.tools.ExecFileLoader;
 import org.jacoco.maven.FileFilter;
 import org.jacoco.report.FileMultiReportOutput;
 import org.jacoco.report.IReportGroupVisitor;
@@ -59,6 +59,8 @@
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.Opcodes;
 
+import static org.objectweb.asm.ClassReader.EXPAND_FRAMES;
+
 /**
  * Creates a code coverage report for a single project in multiple formats (HTML, XML, and CSV).
  * 
@@ -405,7 +407,7 @@ public SanitizingAnalyzer(final ExecutionDataStore executionData, final ICoverag
         @Override
         public void analyzeClass(final ClassReader reader) {
             final ClassVisitor visitor = createSanitizingVisitor(CRC64.checksum(reader.b));
-            reader.accept(visitor, 0);
+            reader.accept(visitor, EXPAND_FRAMES);
         }
 
         private ClassVisitor createSanitizingVisitor(final long classid) {
@@ -414,7 +416,7 @@ private ClassVisitor createSanitizingVisitor(final long classid) {
             final StringPool stringPool = new StringPool();
             final ClassProbesVisitor analyzer = new SanitizingClassAnalyzer(classid, probes, stringPool, coverageVisitor,
                     filter);
-            return new ClassProbesAdapter(analyzer);
+            return new ClassProbesAdapter(analyzer, true);
         }
     }
 
@@ -488,7 +490,7 @@ private static final class SanitizingClassAnalyzer extends ClassAnalyzer {
 
         private SanitizingClassAnalyzer(final long classid, final boolean[] probes, final StringPool stringPool,
                 final ICoverageVisitor coverageVisitor, final MethodCoverageFilter filter) {
-            super(classid, probes, stringPool);
+            super(classid, true, probes, stringPool);
             this.stringPool = stringPool;
             this.probes = probes;
             this.coverageVisitor = coverageVisitor;
diff --git a/jacoco-scalatest-maven-plugin-example/pom.xml b/jacoco-scalatest-maven-plugin-example/pom.xml
index 2209952..7423969 100644
--- a/jacoco-scalatest-maven-plugin-example/pom.xml
+++ b/jacoco-scalatest-maven-plugin-example/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>timezra.maven</groupId>
     <artifactId>jacoco-scalatest-maven-plugin-example</artifactId>
-    <version>0.6.3.2-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <name>Example of JaCoCo and ScalaTest Code Coverage via Maven</name>
     <url>https://github.com/timezra/jacoco-scala-maven-plugin</url>
 
@@ -83,7 +83,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.6.3.201306030806</version>
+                <version>0.7.0.201403182114</version>
                 <executions>
                     <execution>
                         <id>pre-test</id>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>timezra.maven</groupId>
                 <artifactId>jacoco-scala-maven-plugin</artifactId>
-                <version>0.6.3.1</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>post-integration-test</id>
@@ -124,7 +124,7 @@
             <plugin>
                 <groupId>org.scalatest</groupId>
                 <artifactId>scalatest-maven-plugin</artifactId>
-                <version>1.0-RC1</version>
+                <version>1.0</version>
                 <configuration>
                     <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
                     <junitxml>.</junitxml>
diff --git a/pom.xml b/pom.xml
index 2106329..b1961ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>timezra.maven</groupId>
     <artifactId>jacoco-scala-maven-plugin-aggregator</artifactId>
     <packaging>pom</packaging>
-    <version>0.6.3.2-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <name>JaCoCo Scala Maven Plugin Aggregator</name>
     <url>https://github.com/timezra/jacoco-scala-maven-plugin</url>