Submitted to CRAN as 1.1