Merge pull request #634 from laanwj/doxygen