merged pierre's work
fixes all the tests
1.0.0