Made changes for the 2.1.0 release.