Refactor
Merge pull request #16 from erwinwinder/master

Refactor