Merge pull request #3 from crzcrz/master

Fix a compile error I introduced by editing in github web (never again!). Misc cleanup.