Merge pull request #2 from lukewagner/master

Make -Wall -pedantic happy