diff --git a/README.md b/README.md
index 948635a..ad7d0e2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Airbrake Plugin for Grails
+# Airbrake Plugin for Grails 3.1.4 > *
 
 This is the notifier plugin for integrating grails apps with [Airbrake](http://airbrake.io).
 
@@ -6,13 +6,20 @@ When an uncaught exception occurs, Airbrake will POST the relevant data to the A
 
 ## Installation & Configuration
 
-Add the following to your `BuildConfig.groovy`
+Add the following to your `build.gradle`
 
 ```
-compile ":airbrake:0.9.4"
+repositories {
+    ...
+    maven { url "http://dl.bintray.com/marcatriflmedia/plugins" }
+}
+```
+
+```
+compile "grails.plugins:airbrake-grails-3.1:1.0.2"
 ```
 
-Once the plugin is installed, you need to provide your Api Key in `Config.groovy` file:
+Once the plugin is installed, you need to provide your Api Key in `application.groovy` file:
 
 ```groovy
 grails.plugins.airbrake.apiKey = 'YOUR_API_KEY'
@@ -83,7 +90,7 @@ grails.plugins.airbrake.excludes
 ```
 
 ### Enabling/Disabling Notifications
-By default all errors are sent to Airbrake. However, you can disable error notifications (essentially disabling the plugin) by setting `grails.plugins.airbrake.enabled = false`. For example to disable error notificaitons in development and test environments you might have the following in `Config.groovy`:
+By default all errors are sent to Airbrake. However, you can disable error notifications (essentially disabling the plugin) by setting `grails.plugins.airbrake.enabled = false`. For example to disable error notificaitons in development and test environments you might have the following in `application.groovy`:
 
 ```groovy
 grails.plugins.airbrake.apiKey = 'YOUR_API_KEY'
@@ -128,7 +135,7 @@ grails.plugins.airbrake.env = grails.util.Environment.current.name[0..0] // Airb
 
 By default only uncaught errors or errors logged with an exception are reported to Airbrake. It is often convenient to loosen that restriction so that all messages logged at the `Error` level are reported to Airbrake. This often most useful in `src/java` or `src/groovy` classes that can more easily have a log4j logger than get accees to the dependency injected `airbrakeService`. 
 
-With the following line in `Config.groovy`:
+With the following line in `application.groovy`:
 
 ```groovy
 grails.plugins.airbrake.includeEventsWithoutExceptions = true
@@ -225,7 +232,7 @@ This configuration takes a closure with two parameters the `Notice` to send and
 This plugin does not introduce a default choice for processing notices asynchronously. You should choose a method that suits your application.
 You could just create a new thread or use a scheduler/queuing plugin such as [Quartz](http://grails.org/plugin/quartz) or [Jesque](http://grails.org/plugin/jesque)
 
-For example if you are using the Quartz plugin you can send notifications asynchronously using the following setting in `Config.groovy`
+For example if you are using the Quartz plugin you can send notifications asynchronously using the following setting in `application.groovy`
 
 ```groovy
 grails.plugins.airbrake.async = { notice, grailsApplication ->
@@ -250,7 +257,7 @@ class AirbrakeNotifyJob {
 
 ### Stack Trace Filtering
 By default all stack traces are filtered using an instance of `org.codehaus.groovy.grails.exceptions.DefaultStackTraceFilterer` to remove common Grails and java packages.
-To provide custom stack trace filtering simple configure an instance of a class that implements the interface `org.codehaus.groovy.grails.exceptions.StackTraceFilterer` in `Config.groovy`
+To provide custom stack trace filtering simple configure an instance of a class that implements the interface `org.codehaus.groovy.grails.exceptions.StackTraceFilterer` in `application.groovy`
 
 ```groovy
 grails.plugins.airbrake.stackTraceFilterer = new MyCustomStackTraceFilterer()
@@ -265,6 +272,10 @@ A backport to Grails 2.2 is available on the [grails-2.2 branch] (https://github
 
 ## Release Notes
 
+* 1.0.2 - 2016/04/11
+    * Fix AirbrakeAppender for Grails 3.1.4.
+* 1.0.1 - 2016/04/11
+    * Support for Grails 3.1.4.
 * 1.0.0.RC1 - 2015/07/27
     * Support for Grails 3.0. #40
 * 0.9.4 - 2013/06/25
diff --git a/build.gradle b/build.gradle
index afae024..d4774e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,38 +11,22 @@ buildscript {
     }
 }
 
-plugins {
-    id "io.spring.dependency-management" version "0.5.2.RELEASE"
-    id "com.jfrog.bintray" version "1.2"
-}
-
-version "1.0.0.RC1"
-group "org.grails.plugins"
-//ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
+version "1.0.2"
+group "grails.plugins"
 
-apply plugin: 'maven-publish'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: "spring-boot"
-apply plugin: "org.grails.grails-plugin"
-apply plugin: "org.grails.grails-gsp"
-// Used for publishing to central repository, remove if not needed
-apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/grailsCentralPublishing.gradle'
-apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/bintrayPublishing.gradle'
+apply plugin:"eclipse"
+apply plugin:"idea"
+apply plugin:"org.grails.grails-plugin"
+apply plugin:"org.grails.grails-plugin-publish"
+apply plugin:"org.grails.grails-gsp"
 
 ext {
     grailsVersion = project.grailsVersion
     gradleWrapperVersion = project.gradleWrapperVersion
 }
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-
 repositories {
     mavenLocal()
-    mavenCentral()
-    jcenter()
     maven { url "https://repo.grails.org/grails/core" }
 }
 
@@ -54,37 +38,37 @@ dependencyManagement {
 }
 
 dependencies {
-    provided 'org.springframework.boot:spring-boot-starter-logging'
-    provided "org.springframework.boot:spring-boot-starter-actuator"
-    provided "org.springframework.boot:spring-boot-autoconfigure"
-    provided "org.springframework.boot:spring-boot-starter-tomcat"
-
-    provided "org.grails:grails-web-boot"
-    provided "org.grails:grails-dependencies"
-    provided 'javax.servlet:javax.servlet-api:3.1.0'
-
-    testCompile "org.grails:grails-plugin-testing"
-
+    compile "org.springframework.boot:spring-boot-starter-logging"
+    compile "org.springframework.boot:spring-boot-autoconfigure"
+    compile "org.grails:grails-core"
+    compile "org.springframework.boot:spring-boot-starter-actuator"
+    compile "org.springframework.boot:spring-boot-starter-tomcat"
+    compile "org.grails:grails-dependencies"
+    compile "org.grails:grails-web-boot"
+    compile "org.grails.plugins:cache"
+    compile "org.grails.plugins:scaffolding"
     console "org.grails:grails-console"
+    profile "org.grails.profiles:web-plugin:3.1.4"
+    provided "org.grails:grails-plugin-services"
+    provided "org.grails:grails-plugin-domain-class"
+    testCompile "org.grails:grails-plugin-testing"
+    testCompile "org.grails.plugins:geb"
+    testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
+    testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
 }
 
 task wrapper(type: Wrapper) {
     gradleVersion = gradleWrapperVersion
 }
-
-bintray {
-    pkg {
-        userOrg = ''
-        name = 'airbrake-grails'
-        desc = 'Airbrake Client for Grails'
-        websiteUrl = 'https://github.com/cavneb/airbrake-grails'
-        issueTrackerUrl = 'https://github.com/cavneb/airbrake-grails/issues'
-        vcsUrl = 'https://github.com/cavneb/airbrake-grails'
-        licenses = ['Apache-2.0']
-        version {
-            attributes = ['grails-plugin': "airbrake-grails"]
-            name = project.version
-        }
-        publicDownloadNumbers = true
+grailsPublish {
+    // TODO: Provide values here
+    user = ''
+    key = ''
+    githubSlug = 'foo/bar'
+    license {
+        name = 'Apache-2.0'
     }
+    title = "Airbrake-3.1"
+    desc = "Grails Airbrake plugin compatible with version 3.1.4 > *"
+    developers = [marcatriflmedia:"Marc-Emmanuel Ramage"]
 }
diff --git a/gradle.properties b/gradle.properties
index b07f2cc..b6709f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-grailsVersion=3.0.3
-gradleWrapperVersion=2.3
+grailsVersion=3.1.4
+gradleWrapperVersion=2.9
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c97a8bd..9411448 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2bdcf31..d15e30c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Feb 04 17:05:29 CST 2015
+#Mon Apr 11 02:22:43 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..9d82f78 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..aec9973 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/grails-app/conf/application.groovy b/grails-app/conf/application.groovy
new file mode 100644
index 0000000..bf107ef
--- /dev/null
+++ b/grails-app/conf/application.groovy
@@ -0,0 +1,6 @@
+// configuration for plugin testing - will not be included in the plugin zip
+grails.plugins.airbrake.apiKey = 'YOUR_API_KEY'
+grails.plugins.airbrake.paramsFilteredKeys = ['password']
+grails.plugins.airbrake.sessionFilteredKeys = ['password']
+grails.plugins.airbrake.cgiDataFilteredKeys = ['password']
+grails.plugins.airbrake.includeEventsWithoutExceptions = true
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
index b905550..64505b5 100644
--- a/grails-app/conf/application.yml
+++ b/grails-app/conf/application.yml
@@ -2,13 +2,17 @@
 grails:
     profile: web-plugin
     codegen:
-        defaultPackage: airbrake.grails
+        defaultPackage: grails.plugins
+    spring:
+        transactionManagement:
+            proxies: false
 info:
     app:
-        name: 'airbrake-grails'
-        version: '1.0.0.RC1'
-        grailsVersion: '3.0.3'
+        name: '@info.app.name@'
+        version: '@info.app.version@'
+        grailsVersion: '@info.app.grailsVersion@'
 spring:
+
     groovy:
         template:
             check-template-location: false
@@ -30,7 +34,7 @@ grails:
             css: text/css
             csv: text/csv
             form: application/x-www-form-urlencoded
-            html: 
+            html:
               - text/html
               - application/xhtml+xml
             js: text/javascript
@@ -38,9 +42,10 @@ grails:
               - application/json
               - text/json
             multipartForm: multipart/form-data
+            pdf: application/pdf
             rss: application/rss+xml
             text: text/plain
-            hal: 
+            hal:
               - application/hal+json
               - application/hal+xml
             xml:
@@ -64,50 +69,6 @@ grails:
                 scriptlets: html
                 taglib: none
                 staticparts: none
----
-hibernate:
-    cache:
-        queries: false
-        use_second_level_cache: true
-        use_query_cache: false
-        region.factory_class: 'org.hibernate.cache.ehcache.EhCacheRegionFactory' 
-        
-dataSource:
-    pooled: true
-    jmxExport: true
-    driverClassName: org.h2.Driver
-    username: sa
-    password:
-
-environments:
-    development:
-        dataSource:
-            dbCreate: create-drop
-            url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-    test:
-        dataSource:
-            dbCreate: update
-            url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-    production:
-        dataSource:
-            dbCreate: update
-            url: jdbc:h2:prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-            properties:
-                jmxEnabled: true
-                initialSize: 5
-                maxActive: 50
-                minIdle: 5
-                maxIdle: 25
-                maxWait: 10000
-                maxAge: 600000
-                timeBetweenEvictionRunsMillis: 5000
-                minEvictableIdleTimeMillis: 60000
-                validationQuery: SELECT 1
-                validationQueryTimeout: 3
-                validationInterval: 15000
-                testOnBorrow: true
-                testWhileIdle: true
-                testOnReturn: false
-                jdbcInterceptors: ConnectionState
-                defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED
-
+endpoints:
+    jmx:
+        unique-names: true
diff --git a/grails-app/conf/logback.groovy b/grails-app/conf/logback.groovy
index 664238d..2f7c41c 100644
--- a/grails-app/conf/logback.groovy
+++ b/grails-app/conf/logback.groovy
@@ -1,8 +1,6 @@
-import grails.plugins.airbrake.AirbrakeAppender
 import grails.util.BuildSettings
 import grails.util.Environment
 
-
 // See http://logback.qos.ch/manual/groovy.html for details on configuration
 appender('STDOUT', ConsoleAppender) {
     encoder(PatternLayoutEncoder) {
@@ -10,23 +8,16 @@ appender('STDOUT', ConsoleAppender) {
     }
 }
 
-//appender("AIRBRAKE", AirbrakeAppender)
-
 root(ERROR, ['STDOUT'])
 
-
-if(Environment.current == Environment.DEVELOPMENT) {
-    def targetDir = BuildSettings.TARGET_DIR
-    if(targetDir) {
-
-        appender("FULL_STACKTRACE", FileAppender) {
-
-            file = "${targetDir}/stacktrace.log"
-            append = true
-            encoder(PatternLayoutEncoder) {
-                pattern = "%level %logger - %msg%n"
-            }
+def targetDir = BuildSettings.TARGET_DIR
+if (Environment.isDevelopmentMode() && targetDir) {
+    appender("FULL_STACKTRACE", FileAppender) {
+        file = "${targetDir}/stacktrace.log"
+        append = true
+        encoder(PatternLayoutEncoder) {
+            pattern = "%level %logger - %msg%n"
         }
-        logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false )
     }
+    logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false)
 }
diff --git a/grails-app/controllers/grails/plugins/airbrake/TestController.groovy b/grails-app/controllers/grails/plugins/airbrake/TestController.groovy
new file mode 100644
index 0000000..6988035
--- /dev/null
+++ b/grails-app/controllers/grails/plugins/airbrake/TestController.groovy
@@ -0,0 +1,16 @@
+package grails.plugins.airbrake
+
+class TestController {
+
+    AirbrakeService airbrakeService
+
+    def testAirbrake() {
+
+        try {
+            throw new Exception("This is a test error")
+        } catch (Exception e) {
+            airbrakeService.notify(e, [errorMessage: e.getMessage()])
+        }
+        response.flushBuffer()
+    }
+}
diff --git a/grails-app/controllers/grails/plugins/airbrake/UrlMappings.groovy b/grails-app/controllers/grails/plugins/airbrake/UrlMappings.groovy
new file mode 100644
index 0000000..2684cd9
--- /dev/null
+++ b/grails-app/controllers/grails/plugins/airbrake/UrlMappings.groovy
@@ -0,0 +1,16 @@
+package grails.plugins.airbrake
+
+class UrlMappings {
+
+    static mappings = {
+        "/$controller/$action?/$id?(.$format)?"{
+            constraints {
+                // apply constraints here
+            }
+        }
+
+        "/"(view:"/index")
+        "500"(view:'/error')
+        "404"(view:'/notFound')
+    }
+}
diff --git a/grails-app/grails-app.iml b/grails-app/grails-app.iml
new file mode 100644
index 0000000..fe20732
--- /dev/null
+++ b/grails-app/grails-app.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/conf" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/controllers" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/init" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/services" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/grails-app/init/grails/plugins/Application.groovy b/grails-app/init/grails/plugins/Application.groovy
new file mode 100644
index 0000000..732a2ac
--- /dev/null
+++ b/grails-app/init/grails/plugins/Application.groovy
@@ -0,0 +1,10 @@
+package grails.plugins
+
+import grails.boot.GrailsApp
+import grails.boot.config.GrailsAutoConfiguration
+
+class Application extends GrailsAutoConfiguration {
+    static void main(String[] args) {
+        GrailsApp.run(Application, args)
+    }
+}
\ No newline at end of file
diff --git a/grails-app/services/grails/plugins/airbrake/AirbrakeService.groovy b/grails-app/services/grails/plugins/airbrake/AirbrakeService.groovy
index cf43e9e..20504c2 100644
--- a/grails-app/services/grails/plugins/airbrake/AirbrakeService.groovy
+++ b/grails-app/services/grails/plugins/airbrake/AirbrakeService.groovy
@@ -1,7 +1,8 @@
 package grails.plugins.airbrake
 
+import grails.transaction.Transactional
+
 class AirbrakeService {
-    static transactional = false
 
     AirbrakeNotifier airbrakeNotifier
 
diff --git a/grails-app/views/error.gsp b/grails-app/views/error.gsp
index 64a0b08..9a3bb8a 100644
--- a/grails-app/views/error.gsp
+++ b/grails-app/views/error.gsp
@@ -1,11 +1,31 @@
 <!doctype html>
 <html>
-	<head>
-		<title>Grails Runtime Exception</title>
-		<meta name="layout" content="main">
-		<link rel="stylesheet" href="${resource(dir: 'css', file: 'errors.css')}" type="text/css">
-	</head>
-	<body>
-		<g:renderException exception="${exception}" />
-	</body>
-</html>
\ No newline at end of file
+    <head>
+        <title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
+        <meta name="layout" content="main">
+        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
+    </head>
+    <body>
+        <g:if env="development">
+            <g:if test="${Throwable.isInstance(exception)}">
+                <g:renderException exception="${exception}" />
+            </g:if>
+            <g:elseif test="${request.getAttribute('javax.servlet.error.exception')}">
+                <g:renderException exception="${request.getAttribute('javax.servlet.error.exception')}" />
+            </g:elseif>
+            <g:else>
+                <ul class="errors">
+                    <li>An error has occurred</li>
+                    <li>Exception: ${exception}</li>
+                    <li>Message: ${message}</li>
+                    <li>Path: ${path}</li>
+                </ul>
+            </g:else>
+        </g:if>
+        <g:else>
+            <ul class="errors">
+                <li>An error has occurred</li>
+            </ul>
+        </g:else>
+    </body>
+</html>
diff --git a/grails-app/views/index.gsp b/grails-app/views/index.gsp
new file mode 100644
index 0000000..7dda996
--- /dev/null
+++ b/grails-app/views/index.gsp
@@ -0,0 +1,79 @@
+<!doctype html>
+<html>
+<head>
+    <meta name="layout" content="main"/>
+    <title>Welcome to Grails</title>
+
+    <asset:link rel="icon" href="favicon.ico" type="image/x-ico" />
+</head>
+<body>
+    <content tag="nav">
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Application Status <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li><a href="#">Environment: ${grails.util.Environment.current.name}</a></li>
+                <li><a href="#">App profile: ${grailsApplication.config.grails?.profile}</a></li>
+                <li><a href="#">App version:
+                    <g:meta name="info.app.version"/></a>
+                </li>
+                <li role="separator" class="divider"></li>
+                <li><a href="#">Grails version:
+                    <g:meta name="info.app.grailsVersion"/></a>
+                </li>
+                <li><a href="#">Groovy version: ${GroovySystem.getVersion()}</a></li>
+                <li><a href="#">JVM version: ${System.getProperty('java.version')}</a></li>
+                <li role="separator" class="divider"></li>
+                <li><a href="#">Reloading active: ${grails.util.Environment.reloadingAgentEnabled}</a></li>
+            </ul>
+        </li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Artefacts <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li><a href="#">Controllers: ${grailsApplication.controllerClasses.size()}</a></li>
+                <li><a href="#">Domains: ${grailsApplication.domainClasses.size()}</a></li>
+                <li><a href="#">Services: ${grailsApplication.serviceClasses.size()}</a></li>
+                <li><a href="#">Tag Libraries: ${grailsApplication.tagLibClasses.size()}</a></li>
+            </ul>
+        </li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Installed Plugins <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <g:each var="plugin" in="${applicationContext.getBean('pluginManager').allPlugins}">
+                    <li><a href="#">${plugin.name} - ${plugin.version}</a></li>
+                </g:each>
+            </ul>
+        </li>
+    </content>
+
+    <div class="svg" role="presentation">
+        <div class="grails-logo-container">
+            <asset:image src="grails-cupsonly-logo-white.svg" class="grails-logo"/>
+        </div>
+    </div>
+
+    <div id="content" role="main">
+        <section class="row colset-2-its">
+            <h1>Welcome to Grails</h1>
+
+            <p>
+                Congratulations, you have successfully started your first Grails application! At the moment
+                this is the default page, feel free to modify it to either redirect to a controller or display
+                whatever content you may choose. Below is a list of controllers that are currently deployed in
+                this application, click on each to execute its default action:
+            </p>
+
+            <div id="controllers" role="navigation">
+                <h2>Available Controllers:</h2>
+                <ul>
+                    <g:each var="c" in="${grailsApplication.controllerClasses.sort { it.fullName } }">
+                        <li class="controller">
+                            <g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link>
+                        </li>
+                    </g:each>
+                </ul>
+            </div>
+        </section>
+    </div>
+
+</body>
+</html>
diff --git a/grails-app/views/layouts/main.gsp b/grails-app/views/layouts/main.gsp
new file mode 100644
index 0000000..753706a
--- /dev/null
+++ b/grails-app/views/layouts/main.gsp
@@ -0,0 +1,51 @@
+<!doctype html>
+<html lang="en" class="no-js">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <title>
+        <g:layoutTitle default="Grails"/>
+    </title>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+    <asset:stylesheet src="application.css"/>
+
+    <g:layoutHead/>
+</head>
+<body>
+
+    <div class="navbar navbar-default navbar-static-top" role="navigation">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="/#">
+                    <i class="fa grails-icon">
+                        <asset:image src="grails-cupsonly-logo-white.svg"/>
+                    </i> Grails
+                </a>
+            </div>
+            <div class="navbar-collapse collapse" aria-expanded="false" style="height: 0.8px;">
+                <ul class="nav navbar-nav navbar-right">
+                    <g:pageProperty name="page.nav" />
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <g:layoutBody/>
+
+    <div class="footer" role="contentinfo"></div>
+
+    <div id="spinner" class="spinner" style="display:none;">
+        <g:message code="spinner.alt" default="Loading&hellip;"/>
+    </div>
+
+    <asset:javascript src="application.js"/>
+
+</body>
+</html>
diff --git a/grails-app/views/notFound.gsp b/grails-app/views/notFound.gsp
new file mode 100644
index 0000000..4c873ba
--- /dev/null
+++ b/grails-app/views/notFound.gsp
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Page Not Found</title>
+        <meta name="layout" content="main">
+        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
+    </head>
+    <body>
+        <ul class="errors">
+            <li>Error: Page Not Found (404)</li>
+            <li>Path: ${request.forwardURI}</li>
+        </ul>
+    </body>
+</html>
diff --git a/settings.gradle b/settings.gradle
index 87e8efd..a6c2b06 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
-rootProject.name = 'airbrake-grails'
+rootProject.name = 'airbrake-grails-3.1'
+include 'grails.plugins.airbrake'
 
diff --git a/src/main/groovy/grails/plugins/airbrake/AirbrakeAppender.groovy b/src/main/groovy/grails/plugins/airbrake/AirbrakeAppender.groovy
index b1ca0f6..3e0b309 100644
--- a/src/main/groovy/grails/plugins/airbrake/AirbrakeAppender.groovy
+++ b/src/main/groovy/grails/plugins/airbrake/AirbrakeAppender.groovy
@@ -1,28 +1,27 @@
 package grails.plugins.airbrake
 
 import ch.qos.logback.core.AppenderBase
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.filter.ThresholdFilter
+import ch.qos.logback.core.joran.spi.ConsoleTarget
+import ch.qos.logback.core.util.EnvUtil
+import ch.qos.logback.core.util.OptionHelper
+
 
 class AirbrakeAppender<E> extends AppenderBase<E> {
 
     private boolean includeEventsWithoutExceptions
+    private final AirbrakeNotifier notifier
 
     AirbrakeAppender(AirbrakeNotifier notifier, includeEventsWithoutExceptions) {
         this.notifier = notifier
         this.includeEventsWithoutExceptions = includeEventsWithoutExceptions
-        // Only notify on events that are Error Level or greater
-        def errorFilter = new ThresholdFilter(level: Level.ERROR)
-        errorFilter.start()
-        this.addFilter errorFilter
     }
 
-    private final AirbrakeNotifier notifier
 
     @Override
     protected void append(E event) {
-        if ((event?.throwableProxy || includeEventsWithoutExceptions) ) {
-            notifier.notify(event.throwableProxy?.throwable, [errorMessage: event.message.toString()])
+        if ((event?.getThrowableProxy()?.getThrowable() || includeEventsWithoutExceptions)) {
+            notifier.notify(event.getThrowableProxy().getThrowable(), [errorMessage: event.getMessage()])
         }
     }
+
 }
diff --git a/src/main/groovy/grails/plugins/airbrake/AirbrakeGrailsPlugin.groovy b/src/main/groovy/grails/plugins/airbrake/AirbrakeGrailsPlugin.groovy
index 847f12e..ccfc5bf 100644
--- a/src/main/groovy/grails/plugins/airbrake/AirbrakeGrailsPlugin.groovy
+++ b/src/main/groovy/grails/plugins/airbrake/AirbrakeGrailsPlugin.groovy
@@ -1,57 +1,92 @@
 package grails.plugins.airbrake
 
+import ch.qos.logback.classic.Logger
+import ch.qos.logback.classic.LoggerContext
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder
+import ch.qos.logback.classic.util.ContextInitializer
+import ch.qos.logback.core.util.StatusPrinter
 import grails.plugins.Plugin
-import org.slf4j.LoggerFactory;
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
+import org.slf4j.LoggerFactory
 
 class AirbrakeGrailsPlugin extends Plugin {
-    // the plugin version
-    def version = '1.0.0'
+
     // the version or versions of Grails the plugin is designed for
-    def grailsVersion = "3.0.0 > *"
+    def version = '1.0.2'
+    def grailsVersion = "3.1.4 > *"
+    // resources that are excluded from plugin packaging
     def pluginExcludes = [
             "grails-app/conf/**",
             "grails-app/views/**",
             "grails-app/controllers/**",
             "grails-app/jobs/**",
+            "test/**",
+            ""
     ]
 
-    def title = "Airbrake Plugin"
+    // TODO Fill in these fields
+    def title = "Airbreak" // Headline display name of the plugin
     def author = "Eric Berry"
     def authorEmail = "cavneb@gmail.com"
-    def description = "Airbrake Client for Grails"
+    def description = "Airbrake Client for Grails 3.1.4 > *"
+    def profiles = ['web']
+
+    // URL to the plugin's documentation
     def documentation = "https://github.com/cavneb/airbrake-grails"
 
+    // Extra (optional) plugin metadata
+
+    // License: one of 'APACHE', 'GPL2', 'GPL3'
     def license = "APACHE"
-    def developers = [
-        [ name: "Phuong LeCong", email: "phuong@reteltechnologies.com" ],
-        [ name: "Jon Palmer", email: "jpalmer@care.com" ],
-        [ name:  'Donal Murtagh']]
 
-    def issueManagement = [ system: "GitHub", url: "https://github.com/cavneb/airbrake-grails/issues" ]
-    def scm = [ url: AirbrakeNotifier.NOTIFIER_URL ]
+    // Details of company behind the plugin (if there is one)
+//    def organization = [ name: "My Company", url: "http://www.my-company.com/" ]
 
-    def doWithSpring = {
+    // Any additional developers beyond the author specified above.
+    def developers = [[name: "Phuong LeCong", email: "phuong@reteltechnologies.com"], [name: "Jon Palmer", email: "jpalmer@care.com"], [name: 'Donal Murtagh'], [name: "Marc-Emmanuel Ramage", email: "marc@riflmedia.com"]]
 
-        def configuration = new Configuration(application.config.grails.plugins.airbrake.clone())
+    // Location of the plugin's issue tracker.
+    def issueManagement = [system: "GitHub", url: "https://github.com/cavneb/airbrake-grails/issues"]
+    def scm = [url: AirbrakeNotifier.NOTIFIER_URL]
+    // Online location of the plugin's browseable source code.
+//    def scm = [ url: "http://svn.codehaus.org/grails-plugins/" ]
 
-        airbrakeNotifier(AirbrakeNotifier, configuration) { bean ->
-            bean.autowire = "byName"
+    Closure doWithSpring() {
+        { ->
+            def configuration = new Configuration(application.config.grails.plugins.airbrake.clone())
+
+            airbrakeNotifier(AirbrakeNotifier, configuration) { bean ->
+                bean.autowire = "byName"
+            }
+
+            airbrakeAppender(AirbrakeAppender, ref('airbrakeNotifier'), configuration.includeEventsWithoutExceptions)
         }
+    }
 
-        airbrakeAppender(AirbrakeAppender, ref('airbrakeNotifier'), configuration.includeEventsWithoutExceptions)
+    void doWithDynamicMethods() {
+        // TODO Implement registering dynamic methods to classes (optional)
     }
 
-    def doWithApplicationContext = { applicationContext ->
+    void doWithApplicationContext() {
         def appender = applicationContext.airbrakeAppender
-
-        Logger rootLogger = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)
-        LoggerContext loggerContext = LoggerFactory.getILoggerFactory()
-        appender.context = loggerContext
+        Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)
+        LoggerContext loggerContext = (LoggerContext)LoggerFactory.getILoggerFactory()
+        appender.setContext(loggerContext)
         appender.start()
-        rootLogger.addAppender(appender)
+        logger.addAppender(appender)
+    }
+
+    void onChange(Map<String, Object> event) {
+        // TODO Implement code that is executed when any artefact that this plugin is
+        // watching is modified and reloaded. The event contains: event.source,
+        // event.application, event.manager, event.ctx, and event.plugin.
+    }
+
+    void onConfigChange(Map<String, Object> event) {
+        // TODO Implement code that is executed when the project configuration changes.
+        // The event is the same as for 'onChange'.
+    }
 
+    void onShutdown(Map<String, Object> event) {
+        // TODO Implement code that is executed when the application shuts down (optional)
     }
 }
diff --git a/src/main/groovy/grails/plugins/airbrake/AirbrakeNotifier.groovy b/src/main/groovy/grails/plugins/airbrake/AirbrakeNotifier.groovy
index 8be0349..160b26a 100644
--- a/src/main/groovy/grails/plugins/airbrake/AirbrakeNotifier.groovy
+++ b/src/main/groovy/grails/plugins/airbrake/AirbrakeNotifier.groovy
@@ -11,14 +11,14 @@ class AirbrakeNotifier {
     def grailsApplication
 
     static final String AIRBRAKE_API_VERSION = '2.2'
-	static final String AIRBRAKE_HOST = 'airbrakeapp.com'
-	static final String AIRBRAKE_PATH = '/notifier_api/v2/notices'
+    static final String AIRBRAKE_HOST = 'airbrakeapp.com'
+    static final String AIRBRAKE_PATH = '/notifier_api/v2/notices'
 
-	static final String NOTIFIER_NAME = 'grails-airbrake'
-	static final String NOTIFIER_VERSION = '1.0'
-	static final String NOTIFIER_URL = 'https://github.com/cavneb/airbrake-grails'
+    static final String NOTIFIER_NAME = 'grails-airbrake'
+    static final String NOTIFIER_VERSION = '0.9.4'
+    static final String NOTIFIER_URL = 'https://github.com/cavneb/airbrake-grails'
 
-    final Configuration configuration
+    final grails.plugins.airbrake.Configuration configuration
 
     // mostly to make mocking easier in specs
     protected AirbrakeNotifier() {}
@@ -44,13 +44,13 @@ class AirbrakeNotifier {
         new Notice(configuration.merge(options))
     }
 
-	void sendNotice(Notice notice) {
+    void sendNotice(Notice notice) {
         if (configuration.async) {
             configuration.async(notice, grailsApplication)
         } else {
             sendToAirbrake(notice)
         }
-	}
+    }
 
     /**
      * Indicates whether <tt>throwable</tt> can be sent to Airbrake. It will not be eligible for sending if
@@ -77,7 +77,6 @@ class AirbrakeNotifier {
     }
 
     boolean sendToAirbrake(Notice notice) {
-
         if (!configuration.enabled) {
             return false
         }
@@ -92,7 +91,6 @@ class AirbrakeNotifier {
 
         try {
             conn = buildConnection()
-
             if (log.debugEnabled) {
                 log.debug "Sending notice data to ${conn.getURL()}"
 
diff --git a/src/main/groovy/grails/plugins/airbrake/AirbrakeStackTraceFilterer.groovy b/src/main/groovy/grails/plugins/airbrake/AirbrakeStackTraceFilterer.groovy
new file mode 100644
index 0000000..cf270f4
--- /dev/null
+++ b/src/main/groovy/grails/plugins/airbrake/AirbrakeStackTraceFilterer.groovy
@@ -0,0 +1,84 @@
+package grails.plugins.airbrake;
+
+import org.grails.exceptions.reporting.DefaultStackTraceFilterer;
+
+
+/**
+ * Created by marc on 11/04/2016.
+ */
+class AirbrakeStackTraceFilterer extends DefaultStackTraceFilterer{
+
+
+    private static final String[] DEFAULT_INTERNAL_PACKAGES = [
+        "org.grails.plugin.resource.DevMode",
+        "org.grails.",
+        "org.codehaus.groovy.grails.",
+        "gant.",
+        "org.codehaus.groovy.runtime.",
+        "org.codehaus.groovy.reflection.",
+        "org.codehaus.groovy.ast.",
+        "org.codehaus.gant.",
+        "groovy.",
+        "org.mortbay.",
+        "org.apache.catalina.",
+        "org.apache.coyote.",
+        "org.apache.tomcat.",
+        "net.sf.cglib.proxy.",
+        "sun.",
+        "java.lang.reflect.",
+        "org.springframework.",
+        "org.springsource.loaded.",
+        "com.opensymphony.",
+        "org.hibernate.",
+        "javax.servlet."
+    ]
+
+    private List<String> packagesToFilter = new ArrayList<String>()
+    private boolean shouldFilter
+    private String cutOffPackage = null
+
+
+    @Override
+    public Throwable filter(Throwable source) {
+        if (shouldFilter) {
+            StackTraceElement[] trace = source.getStackTrace();
+            List<StackTraceElement> newTrace = filterTraceWithCutOff(trace, cutOffPackage)
+
+            if (newTrace.isEmpty()) {
+                // filter with no cut-off so at least there is some trace
+                newTrace = filterTraceWithCutOff(trace, null)
+            }
+
+            // Only trim the trace if there was some application trace on the stack
+            // if not we will just skip sanitizing and leave it as is
+            if (!newTrace.isEmpty()) {
+                // We don't want to lose anything, so log it
+                //STACK_LOG.error(FULL_STACK_TRACE_MESSAGE, source);
+                StackTraceElement[] clean = new StackTraceElement[newTrace.size()];
+                newTrace.toArray(clean)
+                source.setStackTrace(clean)
+            }
+        }
+        return source;
+    }
+
+    private List<StackTraceElement> filterTraceWithCutOff(StackTraceElement[] trace, String endPackage) {
+        List<StackTraceElement> newTrace = new ArrayList<StackTraceElement>()
+        boolean foundGroovy = false
+        for (StackTraceElement stackTraceElement : trace) {
+            String className = stackTraceElement.getClassName()
+            String fileName = stackTraceElement.getFileName()
+            if (!foundGroovy && fileName != null && fileName.endsWith(".groovy")) {
+                foundGroovy = true;
+            }
+            if (endPackage != null && className.startsWith(endPackage) && foundGroovy) break
+            if (isApplicationClass(className)) {
+                if (stackTraceElement.getLineNumber() > -1) {
+                    newTrace.add(stackTraceElement)
+                }
+            }
+        }
+        return newTrace;
+    }
+
+}
diff --git a/src/main/groovy/grails/plugins/airbrake/Backtrace.groovy b/src/main/groovy/grails/plugins/airbrake/Backtrace.groovy
index 25891b8..7655afb 100644
--- a/src/main/groovy/grails/plugins/airbrake/Backtrace.groovy
+++ b/src/main/groovy/grails/plugins/airbrake/Backtrace.groovy
@@ -28,10 +28,10 @@ class Backtrace {
 
     Map toMap() {
         [
-            className: className,
-            methodName: methodName,
-            fileName: fileName,
-            lineNumber: lineNumber
+                className: className,
+                methodName: methodName,
+                fileName: fileName,
+                lineNumber: lineNumber
         ]
     }
 }
diff --git a/src/main/groovy/grails/plugins/airbrake/Configuration.groovy b/src/main/groovy/grails/plugins/airbrake/Configuration.groovy
index ece956a..e597728 100644
--- a/src/main/groovy/grails/plugins/airbrake/Configuration.groovy
+++ b/src/main/groovy/grails/plugins/airbrake/Configuration.groovy
@@ -3,6 +3,7 @@ package grails.plugins.airbrake
 import grails.util.Environment
 import org.grails.exceptions.reporting.DefaultStackTraceFilterer
 import org.grails.exceptions.reporting.StackTraceFilterer
+
 import javax.annotation.PreDestroy
 import java.util.concurrent.Executors
 import java.util.concurrent.ExecutorService
@@ -35,11 +36,11 @@ class Configuration {
     Configuration(Map options = [:]) {
         configureDefaultAsyncClosure(options)
 
-        // re-implement the map constructor so we can set the port afterwards
+        // reimplement the map constructor so we can set the port afterwards
         options.each { k,v -> if (this.hasProperty(k)) { this."$k" = v} }
         port = port ?: (secure ? 443 : 80)
         if (!stackTraceFilterer) {
-            stackTraceFilterer = new DefaultStackTraceFilterer()
+            stackTraceFilterer = new AirbrakeStackTraceFilterer()//new DefaultStackTraceFilterer()
         }
 
         handleLegacyFilteredKeys(options)
@@ -97,7 +98,7 @@ class Configuration {
     }
 
     // We used to have a single filteredKeys configuration parameter that was used for params, session and cgiData filtering
-    // Here we provide backwards compatibility for that old setting
+    // Here we provide backwards compatibilty for that old setting
     private handleLegacyFilteredKeys(Map options) {
         if (options.filteredKeys) {
             log.warn "Configuration option 'filteredKeys' is deprecated. Use 'paramsFilteredKeys', 'sessionFilteredKeys' or 'cgiDataFilteredKeys' instead."
diff --git a/src/main/groovy/grails/plugins/airbrake/Notice.groovy b/src/main/groovy/grails/plugins/airbrake/Notice.groovy
index 3d6d4f5..7545537 100644
--- a/src/main/groovy/grails/plugins/airbrake/Notice.groovy
+++ b/src/main/groovy/grails/plugins/airbrake/Notice.groovy
@@ -2,9 +2,9 @@ package grails.plugins.airbrake
 
 import groovy.transform.ToString
 import groovy.xml.MarkupBuilder
+import org.grails.exceptions.reporting.StackTraceFilterer
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.web.context.request.RequestContextHolder
-import org.grails.exceptions.reporting.StackTraceFilterer
 
 @ToString(includeNames = true)
 class Notice {
@@ -154,7 +154,7 @@ class Notice {
         // Grails creates a really long error message for uncaught exceptions. Essentially a combination of all the webRequest meta data.
         // However it creates very unhelpful messages for airbrake so we just prefer the simpler message on the throwable
         // This means for exceptions logged by the app code like log.error(message, exception) that we ignore the supplied message.
-        // This is less than ideal (we expect the user supplied message to be useful) but by the time the Appender has the details we
+        // This is less than idea (we expect the user supplied message to be useful) but by the time the Appender has the details we
         // cannot distinguish between the caught and uncaught cases.
         this.errorMessage = throwable?.message ?: args.errorMessage
         this.hostname = args.hostname ?: InetAddress.localHost.hostName
@@ -250,31 +250,31 @@ class Notice {
      */
     Map toMap() {
         [
-            apiKey: apiKey,
-            projectRoot: projectRoot,
-            notifierName: notifierName,
-            notifierVersion: notifierVersion,
-            notifierUrl: notifierUrl,
-            paramsFilteredKeys: paramsFilteredKeys,
-            cgiDataFilteredKeys: cgiDataFilteredKeys,
-            sessionFilteredKeys: sessionFilteredKeys,
-            url: url,
-            component: component,
-            action: action,
-            params: params,
-            env: env,
-            cgiData: cgiData,
-            session: session,
-            backtrace: backtrace*.toMap().toArray(),
-            errorClass: errorClass,
-            errorMessage: errorMessage,
-            hostname: hostname,
-            user: user
+                apiKey: apiKey,
+                projectRoot: projectRoot,
+                notifierName: notifierName,
+                notifierVersion: notifierVersion,
+                notifierUrl: notifierUrl,
+                paramsFilteredKeys: paramsFilteredKeys,
+                cgiDataFilteredKeys: cgiDataFilteredKeys,
+                sessionFilteredKeys: sessionFilteredKeys,
+                url: url,
+                component: component,
+                action: action,
+                params: params,
+                env: env,
+                cgiData: cgiData,
+                session: session,
+                backtrace: backtrace*.toMap().toArray(),
+                errorClass: errorClass,
+                errorMessage: errorMessage,
+                hostname: hostname,
+                user: user
         ]
     }
 
-    private Backtrace[] parseBacktrace(backtrace) {
-        backtrace.collect { new Backtrace(it) }.toArray()
+    private grails.plugins.airbrake.Backtrace[] parseBacktrace(backtrace) {
+        backtrace.collect { new grails.plugins.airbrake.Backtrace(it) }.toArray()
     }
 
     private Map getArgsWithDefaults(args) {
@@ -325,7 +325,7 @@ class Notice {
 
     private applyFilters() {
         ['session', 'cgiData', 'params'].each {
-           setProperty(it, filterParameters(getProperty(it), getProperty("${it}FilteredKeys")) )
+            setProperty(it, filterParameters(getProperty(it), getProperty("${it}FilteredKeys")) )
         }
     }
 
diff --git a/src/main/main.iml b/src/main/main.iml
new file mode 100644
index 0000000..4ad2157
--- /dev/null
+++ b/src/main/main.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/groovy" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/test/groovy/grails/plugins/airbrake/AirbrakeServiceSpec.groovy b/src/test/groovy/grails/plugins/airbrake/AirbrakeServiceSpec.groovy
index dc6f836..28fb247 100644
--- a/src/test/groovy/grails/plugins/airbrake/AirbrakeServiceSpec.groovy
+++ b/src/test/groovy/grails/plugins/airbrake/AirbrakeServiceSpec.groovy
@@ -1,80 +1,22 @@
 package grails.plugins.airbrake
 
-import spock.lang.Specification
 import grails.test.mixin.TestFor
+import spock.lang.Specification
 
+/**
+ * See the API for {@link grails.test.mixin.services.ServiceUnitTestMixin} for usage instructions
+ */
 @TestFor(AirbrakeService)
 class AirbrakeServiceSpec extends Specification {
 
     def setup() {
-        service.airbrakeNotifier = Mock(AirbrakeNotifier)
-    }
-
-    def 'notify calls the notifier'() {
-        given:
-        def exception = new RuntimeException('Damn that Rabbit')
-
-        when:
-        service.notify(exception, [errorMessage: 'That rascally rabbit escaped'])
-
-        then:
-        1 * service.airbrakeNotifier.notify(exception, [errorMessage: 'That rascally rabbit escaped'])
-    }
-
-    def 'notify without throwable parameter'() {
-        when:
-        service.notify(null, [errorMessage: 'That rascally rabbit escaped'])
-
-        then:
-        1 * service.airbrakeNotifier.notify(null, [errorMessage: 'That rascally rabbit escaped'])
-    }
-
-    // prove that the helper methods on the service are just pass through to the NoticeRequestContextHolder
-    def 'set component, action, params'() {
-        when:
-        service.addNoticeContext('component', 'action', [one: 'two'])
-
-        then:
-        Map context = NoticeContextHolder.noticeContext
-        context.component == 'component'
-        context.action == 'action'
-        context.params == [one: 'two']
     }
 
-    def 'set context'() {
-        given:
-        def context = [some: 'param']
-
-        when:
-        service.addNoticeContext(context)
-
-        then:
-        NoticeContextHolder.noticeContext == [some: 'param']
-    }
-
-    def 'clearNoticeContext'() {
-        given:
-        def context = [some: 'param']
-        service.addNoticeContext(context)
-
-        when:
-        service.clearNoticeContext()
-
-        then:
-        NoticeContextHolder.noticeContext == null
-    }
-
-    def 'sendToAirbrake'() {
-        given:
-        def notice = new Notice()
-        when:
-        service.sendToAirbrake(notice)
-
-        then:
-        1 * service.airbrakeNotifier.sendToAirbrake(notice)
+    def cleanup() {
     }
 
-    def cleanup() {
-        NoticeContextHolder.clearNoticeContext()
+    void "test something"() {
+        expect:"fix me"
+            true == false
     }
 }
diff --git a/src/test/groovy/grails/plugins/airbrake/TestControllerSpec.groovy b/src/test/groovy/grails/plugins/airbrake/TestControllerSpec.groovy
new file mode 100644
index 0000000..2ed8a5e
--- /dev/null
+++ b/src/test/groovy/grails/plugins/airbrake/TestControllerSpec.groovy
@@ -0,0 +1,22 @@
+package grails.plugins.airbrake
+
+import grails.test.mixin.TestFor
+import spock.lang.Specification
+
+/**
+ * See the API for {@link grails.test.mixin.web.ControllerUnitTestMixin} for usage instructions
+ */
+@TestFor(TestController)
+class TestControllerSpec extends Specification {
+
+    def setup() {
+    }
+
+    def cleanup() {
+    }
+
+    void "test something"() {
+        expect:"fix me"
+            true == false
+    }
+}
diff --git a/src/test/test.iml b/src/test/test.iml
new file mode 100644
index 0000000..dd51365
--- /dev/null
+++ b/src/test/test.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/groovy" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file