Updating to ceci pulls/47