Merge pull request #218 from saper/build-fixes