Fixing a few warnings
Merge pull request #26 from andrsd/warnings

Fixing a few warnings