added trim tolerance
Merge branch 'master' of github.com:olivervogel/image into olivervogel-master