start working on xe compatibility
Merge pull request #2 from melsomino/xe

start working on xe compatibility