Changes in honour of CRAN
Code cleaning