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

Improve doxygen doc return