fixed / finished re-working code. Now doxygen tags can be successfully parsed.