Dev

Catching Dev and master branches up with each other. Fixing documentation in both. I think tests are not working under a CRAN check though currently.