Refactor
Merge pull request #2 from piccagliani/refactor

merge