Merge pull request #274 from ragerdl/beta

Beta