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

Fixing a few warnings