nutterb Some work to get it ready for CRAN