Merge pull request #343 from peternewman/trivial-fixes

Fix some more Doxygen comment warnings