diff --git a/pom.xml b/pom.xml
index e776a12..5c47306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.jfree</groupId>
     <artifactId>jfreesvg</artifactId>
     <version>3.3</version>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <name>JFreeSVG</name>
     <url>http://www.jfree.org/jfreesvg</url>
@@ -60,6 +60,14 @@
                     <encoding>${project.build.sourceEncoding}</encoding>               
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.3.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                </configuration>
+            </plugin>			
         </plugins>
     </build>
 
diff --git a/src/main/java/org/jfree/graphics2d/svg/SVGGraphics2D.java b/src/main/java/org/jfree/graphics2d/svg/SVGGraphics2D.java
index 95ca5ce..7628edb 100644
--- a/src/main/java/org/jfree/graphics2d/svg/SVGGraphics2D.java
+++ b/src/main/java/org/jfree/graphics2d/svg/SVGGraphics2D.java
@@ -1685,9 +1685,9 @@ public void drawString(String str, float x, float y) {
             appendOptionalElementIDFromHint(this.sb);
             if (!this.transform.isIdentity()) {
             	this.sb.append("transform=\"").append(getSVGTransform(
-                    this.transform));
+                    this.transform)).append("\"");
             }
-            this.sb.append("\">");
+            this.sb.append(">");
             this.sb.append("<text x=\"").append(geomDP(x))
                     .append("\" y=\"").append(geomDP(y))
                     .append("\"");
@@ -2620,8 +2620,13 @@ public boolean drawImage(Image img, AffineTransform xform,
      */
     @Override
     public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
-        BufferedImage imageToDraw = op.filter(img, null);
-        drawImage(imageToDraw, new AffineTransform(1f, 0f, 0f, 1f, x, y), null);
+		BufferedImage imageToDraw;
+		if (op != null)
+			imageToDraw = op.filter(img, null);
+		else
+			imageToDraw = img;
+		
+		drawImage(imageToDraw, new AffineTransform(1f, 0f, 0f, 1f, x, y), null);
     }
 
     /**