fix #70 Inconsistent key usage in image formats parameter
Merge branch 'develop' into enhancement/70
Merge branch 'enhancement/70' into develop