doxygen tags updated
Merge branches 'docs' and 'master'