update dependencies
Merge branch 'update-dependencies'