closes #184
Merge branch 'bugfix-issue-184' into develop