Mm440

Addresses #440 1,6