JLANGX-11 fix
Merge pull request #40 from lburgazzoli/HFT-JLANGX-11-PERF

JLANGX-11 fix