Get it compiling again.
Merge pull request #2 from scr/master

Get it compiling again.