ready for CRAN (again ;__;)