Updating for CRAN submission