Updated dependencies
Merge branch 'master' into update-dependencies
Merge pull request #267 from jvc26/update-dependencies

Updated dependencies