Merge branch 'hotfix/issue-89' , resolves #88
Merge tag 'issue-89' into develop

resolves #88