Merge pull request #28 from Tectu/master

Merge Tectu Changes
Reinsertion of doxygen headers

Reinsertion of doxygen headers that got lost in license change
Merge pull request #67 from inmarket/master

Reinsertion of doxygen headers