Merge pull request #17 from williamjacksn/r4

Build-related fixes