refactor changes
Merge pull request #1 from arubalcaba/master

refactor changes