Merge pull request #1 from PopTo/master

Little changes that fixes a compiler warnings.