Merge pull request #547 from TheBlueMatt/build-updates