diff --git a/pom.xml b/pom.xml
index 4b7a457..349c642 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,226 +1,243 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-    <relativePath />
-  </parent>
-
-  <groupId>com.github.cukespace</groupId>
-  <artifactId>arquillian-asciidoctor-extension</artifactId>
-  <version>0.0.3-SNAPSHOT</version>
-
-  <name>Arquillian Asciidoctor Extension</name>
-  <url>https://github.com/cukespace/arquillian-asciidoctor-extension</url>
-
-  <properties>
-    <!-- project settings -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.source>1.7</project.build.source>
-    <project.build.target>1.7</project.build.target>
-
-    <!-- plugin versions -->
-    <maven-compiler.version>3.5.1</maven-compiler.version>
-    <maven-jar.version>2.3.1</maven-jar.version>
-    <maven-surefire.version>2.19.1</maven-surefire.version>
-
-    <!-- dependency versions -->
-    <jruby.version>9.1.12.0</jruby.version>
-    <asciidoctorj.version>1.5.6</asciidoctorj.version>
-    <shrinkwrap.version>1.2.0</shrinkwrap.version>
-    <arquillian.version>1.1.11.Final</arquillian.version>
-    <junit.version>4.12</junit.version>
-    <assertj.version>2.5.0</assertj.version>
-  </properties>
-
-  <scm>
-    <connection>scm:git:https://github.com/cukespace/arquillian-asciidoctor-extension.git</connection>
-    <developerConnection>scm:git:https://github.com/cukespace/arquillian-asciidoctor-extension.git</developerConnection>
-    <url>https://www.github.com/cukespace/arquillian-asciidoctor-extension</url>
-    <tag>HEAD</tag>
-  </scm>
-
-  <licenses>
-    <license>
-      <name>MIT License</name>
-      <url>http://www.opensource.org/licenses/mit-license</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.arquillian.core</groupId>
-      <artifactId>arquillian-core-spi</artifactId>
-      <version>${arquillian.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.config</groupId>
-      <artifactId>arquillian-config-api</artifactId>
-      <version>${arquillian.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jruby</groupId>
-      <artifactId>jruby-complete</artifactId>
-      <version>${jruby.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.asciidoctor</groupId>
-      <artifactId>asciidoctorj</artifactId>
-      <version>${asciidoctorj.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jruby</groupId>
-          <artifactId>jruby-complete</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.5</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-      <version>${arquillian.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>${assertj.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>apache-tomee</artifactId>
-      <version>7.0.1</version>
-      <scope>test</scope>
-      <type>zip</type>
-      <classifier>webprofile</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>arquillian-tomee-remote</artifactId>
-      <version>7.0.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.asciidoctor</groupId>
-      <artifactId>asciidoctorj-pdf</artifactId>
-      <version>1.5.0-alpha.16</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.asciidoctor</groupId>
-      <artifactId>asciidoctorj-diagram</artifactId>
-      <version>1.5.4.1</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ossrh</serverId>
-          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-          <autoReleaseAfterClose>true</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler.version}</version>
-        <inherited>true</inherited>
-        <configuration>
-          <encoding>${project.build.sourceEncoding}</encoding>
-          <source>${project.build.source}</source>
-          <target>${project.build.target}</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${maven-jar.version}</version>
-        <inherited>true</inherited>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire.version}</version>
-        <executions>
-          <execution>
-            <id>arquillian</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                <exclude>**/AssertsTest*</exclude>
-              </excludes>
-              <skip>${maven.test.skip}</skip>
-            </configuration>
-          </execution>
-          <execution>
-            <id>asserts</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                <exclude>**/AdocGeneratorTest*</exclude>
-              </excludes>
-              <skip>${maven.test.skip}</skip>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation=" http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>com.github.cukespace</groupId>
+    <artifactId>arquillian-asciidoctor-extension</artifactId>
+    <version>0.0.3-SNAPSHOT</version>
+
+    <name>Arquillian Asciidoctor Extension</name>
+    <url>https://github.com/cukespace/arquillian-asciidoctor-extension</url>
+
+    <properties>
+        <!-- project settings -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.source>1.7</project.build.source>
+        <project.build.target>1.7</project.build.target>
+
+        <!-- plugin versions -->
+        <maven-compiler.version>3.5.1</maven-compiler.version>
+        <maven-jar.version>2.3.1</maven-jar.version>
+        <maven-surefire.version>2.19.1</maven-surefire.version>
+
+        <!-- dependency versions -->
+        <jruby.version>9.1.12.0</jruby.version>
+        <asciidoctorj-pdf.version>1.5.0-alpha.16</asciidoctorj-pdf.version>
+        <asciidoctorj.version>1.6.0-alpha.6</asciidoctorj.version>
+        <shrinkwrap.version>1.2.0</shrinkwrap.version>
+        <arquillian.version>1.1.11.Final</arquillian.version>
+        <junit.version>4.12</junit.version>
+        <assertj.version>2.5.0</assertj.version>
+    </properties>
+
+    <scm>
+        <connection>scm:git:https://github.com/cukespace/arquillian-asciidoctor-extension.git</connection>
+        <developerConnection>scm:git:https://github.com/cukespace/arquillian-asciidoctor-extension.git
+        </developerConnection>
+        <url>https://www.github.com/cukespace/arquillian-asciidoctor-extension</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>http://www.opensource.org/licenses/mit-license</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.arquillian.core</groupId>
+            <artifactId>arquillian-core-spi</artifactId>
+            <version>${arquillian.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.config</groupId>
+            <artifactId>arquillian-config-api</artifactId>
+            <version>${arquillian.version}</version>
+            <scope>provided</scope>
+        </dependency>
+         <dependency>
+            <groupId>org.jruby</groupId>
+            <artifactId>jruby-complete</artifactId>
+            <version>${jruby.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj</artifactId>
+            <version>${asciidoctorj.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jruby</groupId>
+                    <artifactId>jruby-complete</artifactId>
+                </exclusion>
+                <exclusion>
+                     <groupId>org.jruby</groupId>
+                    <artifactId>jruby</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj-pdf</artifactId>
+            <version>${asciidoctorj-pdf.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctorj</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-container</artifactId>
+            <version>${arquillian.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomee</groupId>
+            <artifactId>apache-tomee</artifactId>
+            <version>7.0.1</version>
+            <scope>test</scope>
+            <type>zip</type>
+            <classifier>webprofile</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomee</groupId>
+            <artifactId>arquillian-tomee-remote</artifactId>
+            <version>7.0.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj-pdf</artifactId>
+            <version>1.5.0-alpha.16</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj-diagram</artifactId>
+            <version>1.5.4.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler.version}</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <source>${project.build.source}</source>
+                    <target>${project.build.target}</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar.version}</version>
+                <inherited>true</inherited>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire.version}</version>
+                <executions>
+                    <execution>
+                        <id>arquillian</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/AssertsTest*</exclude>
+                            </excludes>
+                            <skip>${maven.test.skip}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>asserts</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/AdocGeneratorTest*</exclude>
+                            </excludes>
+                            <skip>${maven.test.skip}</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/src/main/java/com/github/cukespace/arquillian/asciidoctor/AsciidoctorObserver.java b/src/main/java/com/github/cukespace/arquillian/asciidoctor/AsciidoctorObserver.java
index a35859c..9e35e53 100644
--- a/src/main/java/com/github/cukespace/arquillian/asciidoctor/AsciidoctorObserver.java
+++ b/src/main/java/com/github/cukespace/arquillian/asciidoctor/AsciidoctorObserver.java
@@ -7,16 +7,7 @@
 import org.asciidoctor.AttributesBuilder;
 import org.asciidoctor.OptionsBuilder;
 import org.asciidoctor.SafeMode;
-import org.asciidoctor.extension.BlockMacroProcessor;
-import org.asciidoctor.extension.BlockProcessor;
-import org.asciidoctor.extension.DocinfoProcessor;
-import org.asciidoctor.extension.IncludeProcessor;
-import org.asciidoctor.extension.InlineMacroProcessor;
-import org.asciidoctor.extension.JavaExtensionRegistry;
-import org.asciidoctor.extension.Postprocessor;
-import org.asciidoctor.extension.Preprocessor;
-import org.asciidoctor.extension.Processor;
-import org.asciidoctor.extension.Treeprocessor;
+import org.asciidoctor.extension.*;
 import org.asciidoctor.extension.spi.ExtensionRegistry;
 import org.asciidoctor.internal.JRubyRuntimeContext;
 import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
@@ -29,22 +20,13 @@
 import org.jboss.arquillian.core.spi.EventContext;
 import org.jruby.Ruby;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -53,11 +35,11 @@
 
 // fork of asciidoctor maven plugin
 public class AsciidoctorObserver {
-    
+
     private static Logger LOGGER;
-    
+
     private static final Pattern ASCIIDOC_EXTENSION_PATTERN = Pattern.compile("^[^_.].*\\.a((sc(iidoc)?)|d(oc)?)$");
-    
+
     private static Map<String,Asciidoctor> asciidoctorMap = new HashMap<>();
 
     @Inject
@@ -82,7 +64,7 @@ public void run() {
         adocThread.setDaemon(true);
         adocThread.start();
     }
-    
+
     private void initAsciidoctor(ArquillianDescriptor arquillianDescriptor) {
 
         for (final ExtensionDef extensionDef : arquillianDescriptor.getExtensions()) {
@@ -208,7 +190,7 @@ private void render(final String name, final Map<String, String> extensionDef) {
              throw new RuntimeException("Asciidoctor not initilizable properly.");
         }
 
-        final Ruby rubyInstance = JRubyRuntimeContext.get();
+        final Ruby rubyInstance = JRubyRuntimeContext.get(asciidoctor);
         final String gemHome = rubyInstance.evalScriptlet("ENV['GEM_HOME']").toString();
         final String gemHomeExpected = (gemPath == null || "".equals(gemPath)) ? "" : gemPath.split(java.io.File.pathSeparator)[0];
         if (!"".equals(gemHome) && !gemHomeExpected.equals(gemHome)) {
@@ -273,6 +255,7 @@ private void render(final String name, final Map<String, String> extensionDef) {
         }
         optionsBuilder.attributes(attributesBuilder);
 
+
         new AsciidoctorJExtensionRegistry(extensions, extensionDef).register(asciidoctor);
 
         for (final String resource : resources) {
@@ -346,11 +329,27 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc)
     }
 
 
-    private void renderFile(final String name, final Asciidoctor asciidoctor, final Map<String, Object> options, final File f) {
+    private void renderFile(final String name, final Asciidoctor asciidoctor, final Map<String, Object> options, File f) {
+        ExtensionGroup cukedoctorExtensionGroup = asciidoctor.createGroup("com.github.cukedoctor");
+        if (options.get("backend").toString().equalsIgnoreCase("pdf") && cukedoctorExtensionIsPresent()) {
+             cukedoctorExtensionGroup.unregister();
+        } else if(cukedoctorExtensionIsPresent()){
+             cukedoctorExtensionGroup.unregister();//avoid register twice
+             cukedoctorExtensionGroup.register();
+        }
         asciidoctor.renderFile(f, options);
         getLogger().info("Rendered " + f + " @ " + name);
     }
 
+    private boolean cukedoctorExtensionIsPresent() {
+        try {
+             Class.forName("com.github.cukedoctor.extension.CukedoctorExtensionRegistry");
+             return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
     private void setDestinationPaths(final OptionsBuilder optionsBuilder, final File sourceFile,
                                      final boolean preserveDirectories, final File outputDir,
                                      final boolean relativeBaseDir, final String baseDir, final File sourceDir) {