Merge pull request #68 from nseam/master

Build improvements.