03.21.13 ready for cran
Merge pull request #15 from wrathematics/master

update