towards 3.0.0

Improvement of cloning