Added some roxygen support