Merge pull request #298 from BlythMeister/MyBetaVersion

Beta Fixes
Merge branch 'develop' into release
Fix for #302 checking for null before implicit convert from integer to int.