Merge branch 'feature/issue283' into develop (fixes #278)