refactoring
Merge pull request #1 from Ouri/master

refactoring