mdeguzis Merge pull request #175 from ProfessorKaos64/beta