upgrade dependencies, and fix affected files
Merge pull request #1 from politician/feature/upgrade-dependencies

upgrade dependencies, and fix affected files