Fixing issues cran had with the package. Ver 1.0 to re-submit to CRAN.