Merge pull request #1 from zakhi/zakhi

Zakhi
Merge pull request #2 from zakhi/zakhi

Refactor 2