Created by: MicheldeMessieres
This pull request is one of a set of pull requests being submitted to resolve #634.