Added support for image or other resources
Merge branch 'master' into develop