Improved loading images. See #79