Merge pull request #717 from willmeek/build_fix