Changes in 3.1.0
  - bug fixes and minor cleanups
