First approach for issue #11
Merge branch 'feature-11' into develop
Fix problem exposed by #16