Fix -Wextra warnings
Merge pull request #15 from bmatheny/fix_warnings

Fix -Wextra warnings