My develop

Update to last modifs of wasawi's fork