Various updates in preparation for CRAN release