noramvillanueva modifications for CRAN submission