added isImageOk()
Merge remote-tracking branch 'origin/working' into working
Merge remote-tracking branch 'origin/working' into working