Updated for MP 1.4

Small update, maybe I'll will pick up this project after finishing my
thesis.