Merge pull request #3 from alirezatr/refactor

Refactor