fixed, refactored
Merge pull request #1 from alex-leleka/myfeature

fixed, refactored