updated deps
Merge branch 'develop'