Merge branch 'fixing-rdme' into parameterized-class