Merge pull request #59 from amarkevich/FEDIZ-250