solved ticket 2576
Merge pull request #236 from igal-getrailo/jira-2576

Jira 2576