updated dependencies
Merge branch 'develop'