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