Refactor
Merge pull request #15 from ruedap/refactor

Refactor