V2.1.5 for submission to CRAN