Refactor
Merge pull request #12 from ruedap/refactor

Refactor