Update to 1.1-2.0