update according to new CRAN policies
Merge branch 'master' into vectorize