Added a link to changelog to the README
Improving parameter validation
Fixed file name clashes caused by different watermarks and text overlays
Updated CHANGELOG
Merge branch 'master' into heroku