refactor
Merge pull request #1 from DimitriBeman/master

refactor