Merge pull request #5 from inyigo/refactor

Refactor