Fixed order parsing
New image manipulations
Extended watermark support