Update to 1.1.1 and fix issues related to Swift changes