fixed depencencies scope
Merge origin/master