Doxygen
Doxygen
Merge pull request #42 from ahebert/master

doxygen