Adding last changes to release 2.0.0