finished issue #68
Merge branch 'feature-issue#68' into develop