Ri0n Merge pull request #11 from Neustradamus/justin