JLANGX-11 fix
Merge remote-tracking branch 'upstream/master'
Merge pull request #37 from lburgazzoli/master

 	JLANGX-11 fix