Merge pull request #733 from kuoruan/jql