Updated Dependencies

Replaces my previous pull.

---
Give me a sec while I rebase it against the develop branch. For some reason you have it behind the master branch?