FX-289
Merge pull request #106 from korst1k/dev

FX-289
FX-288