Fixed doxygen warnings in headers
Merge pull request #1383 from dgough/next

Fixed doxygen warnings in headers