Add very basic image loading support
Fix error introduced in rebase