Changes in 0.6.1
  - bug fixes and minor cleanups
