fixed ImageClass.ImageSet
closes #417 and #418