Refactored code
Merge pull request #1 from Gomasy/develop

Refactored code