Fixes #1 - use ImageSpec to detect image types
Merge branch 'master' into develop
Merge branch 'master' into develop