Merge branch 'master' into revert. The last commit was faulty. and i wanted to try some fancy stuff