Merge pull request #840 from DanielSWolf/documentation

Doxygen comments