Build: #559 was successful Changes by Sam <samuel.vonstachelski@fhnw.ch>