Merge branch 'master' of ssh://git.nguyen.vg/SXSI/xpathcomp