Merge pull request #536 from TheBlueMatt/build-updates