Re-added cmn_algebra.
Added cmn_matrix.