Updated image related things
Merge branch 'development'