Fix warnings
Merge pull request #366 from bjz/warnings

Fix warnings