First version of R&M
Merged branch master