Add OutputContainerClass option
Add OutputContainerClass option
Fix doxygen parsing bug