Updated after 1.1.0 merge