Feature/v1.2.0