badrock Merge pull request #49 from fabianfreyer/feature-doxygen