Refactoring
Merge pull request #2 from skhaz/master

Refactoring