solved ticket 2577
Merge pull request #239 from igal-getrailo/jira-2577

Jira 2577