Merge pull request #85 from Thoronador/fix-warnings

Fix warnings