Use unique files when importing images
syntax error fix
set -e the lib
Merge branch 'master' into image-name-flag