bug fix for -J option
Merge remote branch 'origin/master'