Cleaning up ROI stuff
A flag to enable CPU
Merge remote-tracking branch 'github/master'