Merge branch 'hotfix/issue_87'
Removed stray character
Merge branch 'hotfix/issue_89' into develop