Fixed image parser. Issue #355
Merge pull request #454 from aweijnitz/fix-for-issue-355-image-parser

Fix image parser.