FW-322. Fix.
Merge pull request #134 from NicolaAccettura/develop_FW-322

Develop fw 322