Final update before reposting to CRAN