#5 and update with roxygen