Merge pull request #289 from jemc/master

Problem: Build system out of date with zproject