Refactor
Merge pull request #1 from rubenesc/upgrade

Refactor