Merge pull request #8 from pmw/sb

CA-148495: secure build.
CA-148495: secure build.