New version.

Takes into account the modifications of Lorenz.
Also consider some modif of Thomas Moulard.