update to version 1.1.0
merge