Changes in 0.4.2
  - bug fixes and minor cleanups
