Merge pull request #1 from whitj00/beta

Thing
Merge pull request #2 from whitj00/master

Merge pull request #1 from whitj00/beta