Changes in 0.4.0
  - bug fixes and minor cleanups
