For @quepol for testing

Note that you have to check that the compiled versions work too.