Added roxygen comments (doxygen like)
Final adjustments to make rdoc works