fixed some of the Doxygen warnings:
q
more fixes for Doxygen
Merge pull request #129 from ohickey/working_branch

Working branch