include unit in statistics (fixes #56)
Merge branch 'dev'

* dev:
  include unit in statistics (fixes #56)