Upgrade dependencies so it compiles out of the box
Merge remote-tracking branch 'hibikir/master'

Even mean PRs are valued. It's a real contribution.