Merge pull request #193 from ericsagnes/fix/build-setup