Add option to disable xm flow
Merge pull request #105 from mar-v-in/master

Add option to disable xm flow