kill a bunch more warnings!
Merge pull request #5 from moyix/master

kill a bunch more warnings!