fix problems with R CMD check
Merge branch 'dev'