minor rework
Merge branch 'issue-111' into develop