Merge pull request #2 from arunthomas/build_fix