lolchange 1337
fixed merge conflicts, accepted master branch