Final prep before submission to CRAN
Merge pull request #328 from dbetebenner/master

Final prep before submission to CRAN