Merge pull request #87 from jerome-benoit/combined-prs-branch