fixed the bug reported by Jim
Merge remote-tracking branch 'origin/master'