Update to master

Should fix everything.