Changes in 1.3.1
  - bug fixes and minor cleanups
