Merge pull request #53 from fxbonnet/master

Fixed some warnings