Enhancement/update meshes rebased to indigo-devel

This is a rebase of PR #88 to indigo-devel
...accept after #90