Update to Anton Agestams branch