Merge pull request #2019 from timgates42/sc2reader

Add fixes from https://github.com/ggtracker/sc2reader/pull/146