Make it compile.
Merge pull request #1 from neongreen/master

Make it compile.