Merge pull request #188 from rankynbass/move-xl-common-unix

Merge pull request #188 from rankynbass/move-xl-common-unix #306