Fix warnings and build
Merge pull request #11 from steveklabnik/master

Fix warnings and build