Merge pull request #1 from whitj00/beta

Thing