Update to Julien Boudry 0.4 version