Merge pull request #1 from LepageT/Refactoring

Refactoring
Merge pull request #2 from LepageT/Thomas_RMI_!

RMI