minor rework
Merge branch 'issue-106' into develop