Merge pull request #19 from lwaldron/master

misc fixes, now passes R CMD check