Add uncommited changes from the latest package on CRAN