v2.1

creating a PR here for easier review & commenting