Refactor
Merge pull request #3 from AgelxNash/master

Refactor