Merge pull request #149 from euanh/build-improvements

Build improvements