Some more image refactoring
Merge pull request #344 from funkedgeek/master

Some more image refactoring