Refactoring
Update refactoring
Update refactoring
Merge pull request #5 from ax3lst/master

Refactoring