Finished v1.1.0

Clear the mess after incomplete previous merge.