Branche cedric

fixes #3