rework #187 changes
Merge branch 'merge-187' into devel