Fixed issue #4 (adapted xjall and matching tests)