Use static files finders for thumbnails,
Respect watermark= attribute.
Merge pull request #4 from issackelly/master

Two small fixes.