Fix/velocity output

Merged Martin Schneider requested to merge fix/velocity-output into master
Edited by Timo Koch

Merge request reports