Upgrade dependencies
Merge branch 'master' into dependencies-upgrade
Merge pull request #370 from l0rdn1kk0n/dependencies-upgrade

Upgrade dependencies