Xray machine fixes
Merge pull request #117 from ZomgPonies/master

Xray machine fixes