Merge pull request #521 from ahoppen/pr/build-script-improvements

Improvements to build-script.py

Author: ahoppen