Trying to merge to master

This is really annoying. Think everything works now