Merge pull request #1 from willy-ahva/enhancement/imageSupport

Enhancement/image support
Merge branch 'master' into enhancement/addDataValidation