Fork of ddfreyne/cri for submitting enhancements