this compiles
Merge pull request #1 from malb/master

cleaned it up a bit