Merge pull request #350 from BlythMeister/MyBetaVersion

Fix for #346 & #347