Added support for Base64 images.
Merge branch 'dev'