Fixed image loader
image load improvement
Merge branch 'fix_lost_commits'