Updates #225 with changes from DGSOM