Final push for version v2.1.0