fix duplicated images
Merge branch 'dev'