remlapmot Merge pull request #2 from remlapmot/new-roxygen2