Merged in Seb's changes to ofApp