Merge pull request #1 from hvr/pr-buildfix