Fix warnings
Merge pull request #20 from bjz/warnings

Fix warnings