Minor updates for CRAN pass
Merge pull request #551 from dbetebenner/master

Minor updates for CRAN pass