Mm326

Fixes #341
#326