JasonGrant Merge pull request #2 from Achronius/master