update dependency
merge master