Updated to v1.1