Improve doxygen doc return
Merge pull request #706 from VictorLamoine/doxygen_improvments

Improve doxygen doc return