merged milestone 1.1.0