merging dev for new release v2.1.1