Add option to disable xm flow

As requested in #12