Feature/2.0.0 development