Merge cd-raise into cd-cause; Closes #22