Merge pull request #117 from gscholt/build-all-enhancements