Doxygen complete
Merge remote-tracking branch 'origin/diogo'