Merge pull request #2 from mbannert/master

Changes made to the package to get it CRAN ready