Updating dependencies
Merge branch 'fix-dependencies'