Merge pull request #47 from John5025/master

Rage