diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8c907c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*/target/
+*/bin
+.DS_Store
diff --git a/de.vonloesch.pdf4eclipse.feature/feature.xml b/de.vonloesch.pdf4eclipse.feature/feature.xml
index d5fa6d4..0191832 100644
--- a/de.vonloesch.pdf4eclipse.feature/feature.xml
+++ b/de.vonloesch.pdf4eclipse.feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="de.vonloesch.pdf4eclipse"
+      id="de.vonloesch.pdf4eclipse.feature"
       label="PDF4Eclipse"
-      version="1.1.0"
+      version="1.1.0.qualifier"
       provider-name="Boris von Loesch">
 
    <description url="http://borisvl.github.com/Pdf4Eclipse">
@@ -131,12 +131,6 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="de.vonloesch.pdf4eclipse.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="org.jpedal.pdf"
          download-size="0"
diff --git a/de.vonloesch.pdf4eclipse.feature/pom.xml b/de.vonloesch.pdf4eclipse.feature/pom.xml
new file mode 100644
index 0000000..214d82b
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse.feature/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>parent</artifactId>
+    <groupId>de.vonloesch.pdf4eclipse</groupId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>de.vonloesch.pdf4eclipse</groupId>
+  <artifactId>de.vonloesch.pdf4eclipse.feature</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/de.vonloesch.pdf4eclipse.help/META-INF/MANIFEST.MF b/de.vonloesch.pdf4eclipse.help/META-INF/MANIFEST.MF
index 6358441..3cb2c51 100644
--- a/de.vonloesch.pdf4eclipse.help/META-INF/MANIFEST.MF
+++ b/de.vonloesch.pdf4eclipse.help/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: de.vonloesch.pdf4eclipse.help; singleton:=true
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.0.qualifier
 Require-Bundle: org.eclipse.help
diff --git a/de.vonloesch.pdf4eclipse.help/pom.xml b/de.vonloesch.pdf4eclipse.help/pom.xml
new file mode 100644
index 0000000..50d8a80
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse.help/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <artifactId>parent</artifactId>
+    <groupId>de.vonloesch.pdf4eclipse</groupId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>de.vonloesch.pdf4eclipse.help</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <version>1.1.0-SNAPSHOT</version>
+</project>
\ No newline at end of file
diff --git a/de.vonloesch.pdf4eclipse.p2repository/.project b/de.vonloesch.pdf4eclipse.p2repository/.project
new file mode 100644
index 0000000..eb6708b
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse.p2repository/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>de.vonloesch.pdf4eclipse.p2repository</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>
diff --git a/de.vonloesch.pdf4eclipse.p2repository/category.xml b/de.vonloesch.pdf4eclipse.p2repository/category.xml
new file mode 100644
index 0000000..68b27e0
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse.p2repository/category.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/de.vonloesch.pdf4eclipse.feature_1.1.0.qualifier.jar" id="de.vonloesch.pdf4eclipse.feature" version="1.1.0.qualifier">
+      <category name="tychodemo.category"/>
+   </feature>
+   <category-def name="tychodemo.category" label="PDF4Eclipse Category">
+      <description>
+         PDF4Eclipse Category
+      </description>
+   </category-def>
+</site>
diff --git a/de.vonloesch.pdf4eclipse.p2repository/pom.xml b/de.vonloesch.pdf4eclipse.p2repository/pom.xml
new file mode 100644
index 0000000..35bd435
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse.p2repository/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>parent</artifactId>
+    <groupId>de.vonloesch.pdf4eclipse</groupId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>de.vonloesch.pdf4eclipse</groupId>
+  <artifactId>de.vonloesch.pdf4eclipse.p2repository</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-repository</packaging>
+
+</project>
diff --git a/de.vonloesch.pdf4eclipse/.classpath b/de.vonloesch.pdf4eclipse/.classpath
index 0cbffb3..1e35e0f 100644
--- a/de.vonloesch.pdf4eclipse/.classpath
+++ b/de.vonloesch.pdf4eclipse/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/jbig2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/PDFrenderer.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry exported="true" kind="lib" path="lib/jbig2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/PDFrenderer.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/de.vonloesch.pdf4eclipse/.gitignore b/de.vonloesch.pdf4eclipse/.gitignore
new file mode 100644
index 0000000..5e56e04
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/de.vonloesch.pdf4eclipse/.project b/de.vonloesch.pdf4eclipse/.project
index b3c6af0..e2531de 100644
--- a/de.vonloesch.pdf4eclipse/.project
+++ b/de.vonloesch.pdf4eclipse/.project
@@ -1,28 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.vonloesch.pdf4Eclipse</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>de.vonloesch.pdf4Eclipse</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/de.vonloesch.pdf4eclipse/.settings/org.eclipse.m2e.core.prefs b/de.vonloesch.pdf4eclipse/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..ec12694
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Wed Feb 08 14:49:27 PST 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/de.vonloesch.pdf4eclipse/OSGI-INF/l10n/bundle.properties b/de.vonloesch.pdf4eclipse/OSGI-INF/l10n/bundle.properties
index 9f7b588..5019032 100644
--- a/de.vonloesch.pdf4eclipse/OSGI-INF/l10n/bundle.properties
+++ b/de.vonloesch.pdf4eclipse/OSGI-INF/l10n/bundle.properties
@@ -8,9 +8,11 @@ command.description.0 = Set the zoom level
 command.name.0 = Zoom
 commandParameter.name = zoomlevel
 command.name.1 = Toggle highlight
+command.name.2 = Toggle auto-trimming
 command.tooltip = Zoom out
 command.tooltip.0 = Fit page to window
 command.tooltip.1 = Fit page to window width
 command.tooltip.2 = Zoom in
 command.tooltip.3 = Toggle link highlighting
+command.tooltip.4 = Trim Page Margins
 context.name = PDF viewer
\ No newline at end of file
diff --git a/de.vonloesch.pdf4eclipse/build.properties b/de.vonloesch.pdf4eclipse/build.properties
index 16e1348..da2be38 100644
--- a/de.vonloesch.pdf4eclipse/build.properties
+++ b/de.vonloesch.pdf4eclipse/build.properties
@@ -6,4 +6,5 @@ bin.includes = plugin.xml,\
                icons/,\
                lib/,\
                OSGI-INF/l10n/bundle.properties
-
+               lib/jbig2.jar,\
+               lib/PDFrenderer.jar
diff --git a/de.vonloesch.pdf4eclipse/icons/autotrim.png b/de.vonloesch.pdf4eclipse/icons/autotrim.png
new file mode 100644
index 0000000..720a56f
Binary files /dev/null and b/de.vonloesch.pdf4eclipse/icons/autotrim.png differ
diff --git a/de.vonloesch.pdf4eclipse/lib/jbig2.jar b/de.vonloesch.pdf4eclipse/lib/jbig2.jar
new file mode 100644
index 0000000..23ef424
Binary files /dev/null and b/de.vonloesch.pdf4eclipse/lib/jbig2.jar differ
diff --git a/de.vonloesch.pdf4eclipse/plugin.xml b/de.vonloesch.pdf4eclipse/plugin.xml
index fad2752..6b0110b 100644
--- a/de.vonloesch.pdf4eclipse/plugin.xml
+++ b/de.vonloesch.pdf4eclipse/plugin.xml
@@ -56,6 +56,27 @@
             </class>
          </state>
       </command>
+      <command
+            categoryId="de.vonloesch.pdf4Eclipse.category"
+            defaultHandler="de.vonloesch.pdf4eclipse.editors.handlers.ToggleAutoTrimHandler"
+            helpContextId="de.vonloesch.pdf4eclipse.annotationsToggleAutoTrim"
+            id="PDFViewer.command.ToggleAutoTrim"
+            name="%command.name.2">
+         <state
+               id="org.eclipse.ui.commands.toggleState">
+            <class
+                  class="org.eclipse.ui.handlers.RegistryToggleState">
+               <parameter
+                     name="persisted"
+                     value="true">
+               </parameter>
+               <parameter
+                     name="default"
+                     value="false">
+               </parameter>
+            </class>
+         </state>
+      </command>
       <category
             id="de.vonloesch.pdf4Eclipse.category"
             name="Pdf4Eclipse">
@@ -133,7 +154,7 @@
             <command
                   commandId="PDFViewer.command.Zoom"
                   icon="icons/arrow-move.png"
-                  style="push"
+                  style="toggle"
                   tooltip="%command.tooltip.0">
                <visibleWhen
                      checkEnabled="false">
@@ -149,7 +170,7 @@
             <command
                   commandId="PDFViewer.command.Zoom"
                   icon="icons/arrow-resize.png"
-                  style="push"
+                  style="toggle"
                   tooltip="%command.tooltip.1">
                <visibleWhen
                      checkEnabled="false">
@@ -190,6 +211,18 @@
                   </reference>
                </visibleWhen>
             </command>
+            <command
+                  commandId="PDFViewer.command.ToggleAutoTrim"
+                  icon="icons/autotrim.png"
+                  style="toggle"
+                  tooltip="%command.tooltip.4">
+               <visibleWhen
+                     checkEnabled="false">
+                  <reference
+                        definitionId="PDFViewer.definitions.isPDFEditorActive">
+                  </reference>
+               </visibleWhen>
+            </command>
          </toolbar>
       </menuContribution>
    </extension>
diff --git a/de.vonloesch.pdf4eclipse/pom.xml b/de.vonloesch.pdf4eclipse/pom.xml
new file mode 100644
index 0000000..76f4d29
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <artifactId>parent</artifactId>
+    <groupId>de.vonloesch.pdf4eclipse</groupId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>de.vonloesch.pdf4Eclipse</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <version>1.1.0-SNAPSHOT</version>
+</project>
\ No newline at end of file
diff --git a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/PDFPageViewer.java b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/PDFPageViewer.java
index f6b5c18..a24bb27 100644
--- a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/PDFPageViewer.java
+++ b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/PDFPageViewer.java
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Boris von Loesch - initial API and implementation
+ *     Robert Bamler - auto-trimming of page margins
  ******************************************************************************/
 package de.vonloesch.pdf4eclipse;
 
@@ -16,6 +17,7 @@
 import java.awt.geom.Rectangle2D.Double;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
+import java.awt.image.DataBufferInt;
 import java.awt.image.DirectColorModel;
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
@@ -39,6 +41,7 @@
 import org.eclipse.swt.widgets.Display;
 
 import de.vonloesch.pdf4eclipse.editors.PDFEditor;
+import de.vonloesch.pdf4eclipse.editors.handlers.ToggleAutoTrimHandler;
 import de.vonloesch.pdf4eclipse.editors.handlers.ToggleLinkHighlightHandler;
 import de.vonloesch.pdf4eclipse.model.IPDFLinkAnnotation;
 import de.vonloesch.pdf4eclipse.model.IPDFPage;
@@ -72,6 +75,11 @@ public class PDFPageViewer extends Canvas implements PaintListener, IPreferenceC
     
     private float zoomFactor;
     
+    private boolean autoTrimOn = true;
+    private Point trimOffset = new Point(0, 0);
+    private float horizontalTrimFactor = 1.0f;
+    private float verticalTrimFactor = 1.0f;
+    
     //private org.eclipse.swt.graphics.Image swtImage;
 
     /**
@@ -178,6 +186,7 @@ public void run() {
 		prefs.addPreferenceChangeListener(this);
 		
 		highlightLinks = prefs.getBoolean(ToggleLinkHighlightHandler.PREF_LINKHIGHTLIGHT_ID, true);
+		autoTrimOn = prefs.getBoolean(ToggleAutoTrimHandler.PREF_AUTOTRIM_ID, true);
     }
 
     
@@ -299,13 +308,17 @@ public void showPage(IPDFPage page) {
     	highlight = null;
 
     	boolean resize = false;
-    	int newW = Math.round(zoomFactor*page.getWidth());
-    	int newH = Math.round(zoomFactor*page.getHeight());
+    	// always round _down_ so that the fit-to-screen commands work properly
+    	int newW = (int) (zoomFactor*page.getWidth());
+    	int newH = (int) (zoomFactor*page.getHeight());
 
     	Point sz = getSize();
 
     	if (sz.x == 0 || sz.y == 0) return;
     	currentImage = page.getImage(newH, newW);
+    	if (autoTrimOn) {
+    		trimCurrentImage();
+    	}
 
     	newW = currentImage.getWidth(null);
     	newH = currentImage.getHeight(null);
@@ -329,16 +342,97 @@ public void showPage(IPDFPage page) {
     	}
     }
 
+    private void trimCurrentImage() {
+    	if (currentImage==null)
+    		return;
+    	
+    	int origw = currentImage.getWidth(null);
+    	int origh = currentImage.getHeight(null);
+    	if (origw<1 || origh<1)
+    		return;
+    	
+    	BufferedImage img = new BufferedImage(origw, origh, BufferedImage.TYPE_INT_ARGB);
+    	img.getGraphics().drawImage(currentImage, 0, 0, origw, origh, 0, 0,	origw, origh, null);
+
+    	int[] srcbuf = ((DataBufferInt) img.getRaster().getDataBuffer()).getData();
+
+    	// detect upper margin
+    	int trimy1 = origh;
+    	int referenceColor = srcbuf[0];
+    	for (int i=0; i!=srcbuf.length; i++) {
+    		if (srcbuf[i] != referenceColor) {
+    			trimy1 = i/origw;
+    			break;
+    		}
+    	}
+    	
+    	// detect lower margin
+    	int trimy2 = 0;
+    	referenceColor = srcbuf[srcbuf.length-1];
+    	for (int i=srcbuf.length-1; i!=trimy1*origw-1; i--) {
+    		if (srcbuf[i] != referenceColor) {
+    			trimy2 = i/origw + 1;
+    			break;
+    		}
+    	}
+    	
+    	// detect left margin
+    	int trimx1 = 0;
+    	referenceColor = srcbuf[0];
+    	int offset = trimy1*origw;
+    	int end = trimy2*origw;
+    	trimx1loop:
+    		while (trimx1 != origw) {
+    			for (int i=offset+trimx1; i<end; i+=origw) {
+    				if (srcbuf[i] != referenceColor)
+    					break trimx1loop;
+    			}
+    			trimx1++;
+    		}
+    	
+    	// detect right margin
+    	int trimx2 = origw-1;
+    	referenceColor = srcbuf[srcbuf.length-1];
+    	trimx2loop:
+    		while (trimx2 != trimy1) {
+    			for (int i=offset+trimx2; i<end; i+=origw) {
+    				if (srcbuf[i] != referenceColor)
+    					break trimx2loop;
+    			}
+    			trimx2--;
+    		}
+    	trimx2++;
+    	
+    	// add some margin (2% of the smaller one of the two dimensions) 
+    	int margin = Math.min(trimx2-trimx1, trimy2-trimy1) / 50;
+    	trimx1 = Math.max(0, trimx1-margin);
+    	trimx2 = Math.min(origw, trimx2+margin);
+    	trimy1 = Math.max(0, trimy1-margin);
+    	trimy2 = Math.min(origh, trimy2+margin);
+    	
+    	// remember trim margins
+    	trimOffset .x = trimx1;
+    	trimOffset.y = trimy1;
+    	horizontalTrimFactor = 1.0f * (trimx2-trimx1) / origw;
+    	verticalTrimFactor = 1.0f * (trimy2-trimy1) / origh;
+    	
+    	// crop image
+    	currentImage = img.getSubimage(trimx1, trimy1, trimx2-trimx1, trimy2-trimy1);
+    }
+    
     private Rectangle getRectangle(Rectangle2D r) {
     	return new Rectangle((int)Math.round(r.getX()), (int)Math.round(r.getY()), (int)Math.round(r.getWidth()), (int)Math.round(r.getHeight()));
     }
     
     public Rectangle2D convertPDF2ImageCoord(Rectangle2D r) {
-    	return currentPage.pdf2ImageCoordinates(r);
+    	Rectangle2D coord = currentPage.pdf2ImageCoordinates(r);
+    	coord.setRect(coord.getX()-trimOffset.x, coord.getY()-trimOffset.y, coord.getWidth(), coord.getHeight());
+    	return coord;
     }
     
     public Rectangle2D convertImage2PDFCoord(Rectangle2D r) {
-    	return currentPage.image2PdfCoordinates(r);
+    	java.awt.Rectangle coord = new java.awt.Rectangle((int)r.getX()+trimOffset.x, (int)r.getY()+trimOffset.y, (int)r.getWidth(), (int)r.getHeight());
+    	return currentPage.image2PdfCoordinates(coord);
     }
     
     /**
@@ -423,6 +517,15 @@ public void preferenceChange(PreferenceChangeEvent event) {
     	if (ToggleLinkHighlightHandler.PREF_LINKHIGHTLIGHT_ID.equals(event.getKey())) {
     		highlightLinks = Boolean.parseBoolean((String)(event.getNewValue()));
     		redraw();
+    	} else if (ToggleAutoTrimHandler.PREF_AUTOTRIM_ID.equals(event.getKey())) {
+    		autoTrimOn = Boolean.parseBoolean((String)(event.getNewValue()));
+    		if (!autoTrimOn) {
+    			trimOffset.x = 0;
+    			trimOffset.y = 0;
+    			horizontalTrimFactor = 1.0f;
+    			verticalTrimFactor = 1.0f;
+    		}
+    		showPage(currentPage);
     	}
     }
     
@@ -445,4 +548,14 @@ public void dispose() {
     	IEclipsePreferences prefs = (new InstanceScope()).getNode(de.vonloesch.pdf4eclipse.Activator.PLUGIN_ID);
     	prefs.removePreferenceChangeListener(this);
     }
+
+
+	public float getHorizontalTrimFactor() {
+		return horizontalTrimFactor;
+	}
+
+
+	public float getVerticalTrimFactor() {
+		return verticalTrimFactor;
+	}
 }
\ No newline at end of file
diff --git a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/PDFEditor.java b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/PDFEditor.java
index 12e3459..62118ff 100644
--- a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/PDFEditor.java
+++ b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/PDFEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Boris von Loesch - initial API and implementation
  *     MeisterYeti - pseudo-continuous scrolling and zooming by mouse wheel
+ *     Robert Bamler - auto-trimming of page margins
  ******************************************************************************/
 package de.vonloesch.pdf4eclipse.editors;
 
@@ -44,6 +45,8 @@
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.events.KeyAdapter;
@@ -55,6 +58,8 @@
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
@@ -250,11 +255,37 @@ public void run() {
 
 	@Override
 	public void createPartControl(final Composite parent) {
+		Composite composite= new Composite(parent, SWT.NONE);
+		GridLayout layout= new GridLayout(1, false);
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		layout.horizontalSpacing= 0;
+		layout.verticalSpacing= 0;
+		composite.setLayout(layout);
+		
+		// a composite used to show controls
+		Composite menuC = new Composite(composite, SWT.NONE);
+		GridData layoutData= new GridData(SWT.FILL, SWT.TOP, true, false);
+		menuC.setLayoutData(layoutData);
+		layout = new GridLayout(1, false);
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		layout.horizontalSpacing= 0;
+		layout.verticalSpacing= 0;
+		layoutData.exclude= true;
+		menuC.setLayout(layout);
+		
+		sc = new ScrolledComposite(composite, SWT.H_SCROLL | SWT.V_SCROLL);
+		sc.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		FillLayout fillLayout= new FillLayout(SWT.VERTICAL);
+		fillLayout.marginHeight= 0;
+		fillLayout.marginWidth= 0;
+		fillLayout.spacing= 0;
+		sc.setLayout(fillLayout);
+		
 		cursorHand = new Cursor(Display.getDefault(), SWT.CURSOR_HAND);
 		cursorArrow = new Cursor(Display.getDefault(), SWT.CURSOR_ARROW);
-		
-		parent.setLayout(new FillLayout());
-		sc = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+
 		pv = new PDFPageViewer(sc, this);
 		//pv = new PDFPageViewerAWT(sc, this);
 		sc.setContent(pv);
@@ -471,6 +502,28 @@ else if (e.keyCode == SWT.END) {
 		}
 
 		initKeyBindingContext();
+		sc.addControlListener(new ControlListener() {
+
+			@Override
+			public void controlResized(ControlEvent e) {
+				try {
+				  switch (fitState) {
+				  case FIT:
+				    fit();
+				    break;
+				  case FITH:
+				    fitHorizontal();
+				    break;
+				  case NONE:
+				    break;
+				  }
+				} catch (Exception ex) {}
+			}
+
+			@Override
+			public void controlMoved(ControlEvent e) {
+			}
+		});
 	}
 
     @Override
@@ -739,15 +792,41 @@ public INavigationLocation createNavigationLocation() {
 	private void updateStatusLine() {
 		position.setPageInfo(currentPage, f.getNumPages());
 	}
+	
+	private enum FIT_STATE {
+	  NONE,
+	  FIT,
+	  FITH;
+	}
+	
+	private FIT_STATE fitState = FIT_STATE.FITH;
+    
+    public void _fitHorizontal() {
+      if (fitState == FIT_STATE.FITH)
+        fitState = FIT_STATE.NONE;
+      else {
+        fitState = FIT_STATE.FITH;
+        fitHorizontal();
+      }
+    }
+    
+    public void _fit() {
+      if (fitState == FIT_STATE.FIT)
+        fitState = FIT_STATE.NONE;
+      else {
+        fitState = FIT_STATE.FIT;
+        fit();
+      }
+    }
 
 	public void fitHorizontal() {
 		int w = sc.getClientArea().width;
-		pv.setZoomFactor((1.0f*w)/pv.getPage().getWidth());
+		pv.setZoomFactor((1.0f/pv.getHorizontalTrimFactor()*w)/pv.getPage().getWidth());
 	}
 
 	public void fit() {
-		float w = 1.f * sc.getClientArea().width;
-		float h = 1.f * sc.getClientArea().height;
+		float w = 1.f/pv.getHorizontalTrimFactor() * sc.getClientArea().width;
+		float h = 1.f/pv.getVerticalTrimFactor() * sc.getClientArea().height;
 		float pw = pv.getPage().getWidth();
 		float ph = pv.getPage().getHeight();
 		if (w/pw < h/ph) pv.setZoomFactor(w/pw);
diff --git a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/handlers/ToggleAutoTrimHandler.java b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/handlers/ToggleAutoTrimHandler.java
new file mode 100644
index 0000000..cb91746
--- /dev/null
+++ b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/handlers/ToggleAutoTrimHandler.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Boris von Loesch.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Boris von Loesch - initial API and implementation
+ *     Robert Bamler - auto-trimming of page margins
+ ******************************************************************************/
+package de.vonloesch.pdf4eclipse.editors.handlers;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.State;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.commands.IElementUpdater;
+import org.eclipse.ui.handlers.RegistryToggleState;
+import org.eclipse.ui.menus.UIElement;
+import org.osgi.service.prefs.BackingStoreException;
+
+public class ToggleAutoTrimHandler extends AbstractHandler implements IElementUpdater{
+
+	public final static String PREF_AUTOTRIM_ID = "de.vonloesch.pdf4eclipse.preferences.autoTrim";
+
+	private final static String COMMAND_ID = "PDFViewer.command.ToggleAutoTrim";
+	private final static String STATE_ID = RegistryToggleState.STATE_ID;
+	
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		Command command = event.getCommand();
+		State state = command.getState(STATE_ID);
+		state.setValue(!(Boolean) state.getValue());
+
+		ICommandService service =
+				(ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+		service.refreshElements(command.getId(), null);
+		IEclipsePreferences prefs = (new InstanceScope()).getNode(de.vonloesch.pdf4eclipse.Activator.PLUGIN_ID);
+		prefs.putBoolean(PREF_AUTOTRIM_ID, ((Boolean) state.getValue()).booleanValue());
+		try {
+			prefs.flush();
+		} catch (BackingStoreException e) {
+			//Do nothing
+		}
+		return null;
+	}	
+	
+	@Override
+	public void updateElement(UIElement element, Map parameters) {
+		ICommandService service =
+				(ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+		Command command = service.getCommand(COMMAND_ID);
+		State state = command.getState(STATE_ID);
+		element.setChecked(((Boolean) state.getValue()).booleanValue());		
+	}
+
+}
diff --git a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/handlers/ZoomHandler.java b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/handlers/ZoomHandler.java
index 35f940f..9a4a58a 100644
--- a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/handlers/ZoomHandler.java
+++ b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/editors/handlers/ZoomHandler.java
@@ -56,11 +56,11 @@ else if (msg.charAt(0) == '=') {
 		}
 		
 		else if (msg.toLowerCase().equals(FIT_HORIZONTAL)) {
-			((PDFEditor) editor).fitHorizontal();
+			((PDFEditor) editor)._fitHorizontal();
 			return null;
 		}
 		else if (msg.toLowerCase().equals(FIT_COMPLETE)) {
-			((PDFEditor) editor).fit();
+			((PDFEditor) editor)._fit();
 			return null;
 		}
 
diff --git a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/preferences/PreferenceInitializer.java b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/preferences/PreferenceInitializer.java
index 391c452..7656082 100644
--- a/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/preferences/PreferenceInitializer.java
+++ b/de.vonloesch.pdf4eclipse/src/de/vonloesch/pdf4eclipse/preferences/PreferenceInitializer.java
@@ -15,6 +15,7 @@
 import org.eclipse.jface.preference.IPreferenceStore;
 
 import de.vonloesch.pdf4eclipse.Activator;
+import de.vonloesch.pdf4eclipse.editors.handlers.ToggleAutoTrimHandler;
 import de.vonloesch.pdf4eclipse.model.PDFFactory;
 
 /**
@@ -31,6 +32,7 @@ public void initializeDefaultPreferences() {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		store.setDefault(PreferenceConstants.PSEUDO_CONTINUOUS_SCROLLING, true);
 		store.setDefault(PreferenceConstants.PDF_RENDERER, PDFFactory.STRATEGY_SUN_JPEDAL);
+		store.setDefault(ToggleAutoTrimHandler.PREF_AUTOTRIM_ID, true);
 	}
 
 }
diff --git a/org.jpedal.pdf/pom.xml b/org.jpedal.pdf/pom.xml
new file mode 100644
index 0000000..a19aeca
--- /dev/null
+++ b/org.jpedal.pdf/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <artifactId>parent</artifactId>
+    <groupId>de.vonloesch.pdf4eclipse</groupId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>org.jpedal.pdf</artifactId>
+  <version>4.74.27</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..33dbd64
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,117 @@
+<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>
+  <groupId>de.vonloesch.pdf4eclipse</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  
+	<modules>
+		<module>org.jpedal.pdf</module>
+		<module>de.vonloesch.pdf4eclipse.help</module>
+		<module>de.vonloesch.pdf4eclipse</module>
+		<module>de.vonloesch.pdf4eclipse.feature</module>
+		<!-- p2 repository for updates -->
+		<module>de.vonloesch.pdf4eclipse.p2repository</module>
+	</modules>
+
+
+	<prerequisites>
+		<maven>3.0</maven>
+	</prerequisites>
+
+	<!-- Minimum tycho version build work with -->
+	<properties>
+		<!-- http://maven.apache.org/general.html#encoding-warning  -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<tycho-version>0.24.0</tycho-version>
+	</properties>
+
+  <repositories>
+    <!-- configure p2 repository to resolve against -->
+    <repository>
+      <id>mars</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/</url>
+    </repository>
+  </repositories>
+
+	<build>
+		<plugins>
+			<!-- enable tycho build extension -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+            <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+	        	<artifactId>tycho-compiler-plugin</artifactId>
+	        	<version>${tycho-version}</version>
+			    <configuration>
+			    	<source>1.6</source>
+			    	<target>1.6</target>
+					<encoding>UTF-8</encoding>
+			    </configuration>
+			</plugin>
+			<plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+	        	<artifactId>tycho-packaging-plugin</artifactId>
+	        	<version>${tycho-version}</version>
+			    <configuration>
+				    <archive>
+				    	<addMavenDescriptor>false</addMavenDescriptor>
+				    </archive>
+			    </configuration>
+			</plugin>
+    			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<!-- configure the p2 target environments for multi-platform build -->
+					<environments>
+
+						<!-- Linux -->
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+
+						<!-- Windows -->
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+
+						<!-- Mac -->
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>