upgraded dependencies
upgraded dependencies
Merge branch 'dev'