fixed #120
  - merge #123 and add Changelog