Switch to EUMM. This may close #5