FX-288
Merge pull request #13 from fix8/dev

FX-288