Refactor
Merge pull request #4 from iBencon/004_refactor

Refactor