Altered to meet CRAN requirements