Cml 41c

these changes contain the changes in #247 and #251 + updates