update deps
Merge branch 'update'