Update to 2.1.1

The updated version removes the need for the patches.