merge request to v2.1.0

let's update