Updating to upstream version 1.1.0