v1.1.1 with some bug fixes