GitLab

Merge branch 'develop' into svn: more pretty printing; change variable names to comply with (unfortunately missing) coding style (Use descriptive names)