Philipp/fix memory leaks

Merged Philipp von Spinn requested to merge philipp/fix_memory_leaks into master

Merge request reports