[FALL-60]
Merge pull request #2 from nexelem/feature/FALL-60

[FALL-60]