ADDED NAMESPACE AND ROXYGEN COMMENTS