Update to 1.1.1

I've applied each of the previous updates as well for historical reasons