ofximage delete ofImage! Fixing memory leak.  Merge in Maja's changes