Fix for images loading
Merge branch 'develop'