Merged master into node before making a pull request

I suppose this is goodbye then, for now...