Update to Version 0.22