Upgrading deps
Merge pull request #88 from krux/upgrade-deps

Upgrading deps
Merge remote-tracking branch 'upstream/master'