update to version 1.1
merge