Refactor
Merge pull request #10 from ruedap/refactor

Refactor