Nick's Changes to Fix Overwatch
Merge branch 'master' of https://github.com/UnofficialSpaceHulkTeam/UnofficialSpaceHulk