update for img
Merge branch 'dev'