refactor
Merge pull request #1 from laurynasra/master

refactor