Refactor 2
Merge pull request #2 from zakhi/zakhi

Refactor 2