Refactoring.
Merge pull request #7 from infobip/master

Refactoring.