Paul and Cory's repo
Merge pull request #123 from BlueVajra/patch-4

Paul and Cory's repo