Update dependencies, minor tweaks format
Merge pull request #1 from watilde/master

Update dependencies, minor tweaks format