Made the move towards roxygen in this version
Updated documentation using roxygen