resolved merge conflict
Merge branch 'PhilippHagenlocher-master'