added dependencies
Merge branch 'origin/master'