Upgrade dependencies, fixes #20