Strange mix between XeLaTeX and LuaLaTeX in the previous commit.
This version WORKS with xelatex.

TODO: I may add some code to handle LuaLaTex at the same time.