XD nightmare
Merge pull request #73 from nixhex/patch-2

XD nightmare