Cml 41b

This request contains the changes in #247