Added needed dependencies.
Merge origin/master