Updating master to 1.1