fix #95
Merge branch 'master' into feature/UUID

* master:
  fix #95