Documentation for Doxigen
Merge origin/master