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