Updated for recent build environment updates.
Merge pull request #4 from egonw/patch-1

Updated for recent build environment updates.