Work of the last weeks (before github)