Merge pull request #2 from BedeGaming/master

null content bug fix from bede gaming fork
build fix
Merge pull request #3 from paynecrl97/master

build fix