Merge pull request #3 from lovmoen/master

Problem: zlabs project is out of date and doesn't build.