image format
Merge pull request #418 from naturwerk/minor-bugs

image format