refactoring
Merge pull request #2 from AiiR42/master

refactoring