Final prep for v 2.1.0

Changes to support issue #186, release prep.