Fix issue #14
Merge branch 'merge-tree' into dev

* merge-tree:
  Fix issue #14