Fix collation order
Update to roxygen2