Merge version 2.1.0 to master for release