Merge pull request #4 from jeanguyomarch/master

Tested on Mac OS X. Since there was no structural changes, the compatibility should not be broken.
Merge pull request #5 from jeanguyomarch/master

Add Doxygen support