arturl Merge pull request #1 from kirkshoop/xplat