Updating dependencies
Merge branch 'feat-upgrade'