pushing Niklas' chanages into the master branch