fixes #382
Merge branch 'enhancement-382' into develop