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