Mmol/elute

From ~elute, aka Kate Farnsworth.  Rebased her changes from her master on top of my rebased changes.