Merge branch 'issues/184' into 'develop'