Fixed bug to prevent drawing rois when none exist
Merge remote-tracking branch 'origin/ari'