Merge pull request #532 from TheBlueMatt/build-updates