Roll-up v0.2.2 for CRAN