Merge pull request #13 from dpursehouse/fix-compilation-warnings

Fix compilation warnings