Update to 0.2.22