update through2

fixes watermark stuff
Merge pull request #34 from contra/patch-3

update through2