REIS0 Merge pull request #6 from REIS0/refactor