Update dependencies
Merge pull request #98 from rafaelgonzalez/update-dependencies

Update dependencies
Update dependencies
Merge pull request #99 from rafaelgonzalez/update-dependencies

Update dependencies
WIP
WIP
wip