refactor
refactored
Merge pull request #5 from Pouncealot/master

(refac)Refactoring