Code

Merge remote branches 'jn/cosmetics', 'jn/doxygen' and 'jn/renames'