Merge pull request #12 from koxon/master

Watermark are now working well and handle transparency on the image