Merge pull request #2144 from tishibas/load_image-improved